This commit is contained in:
root
2025-11-13 19:52:28 +03:00
parent 8aeeb05b7d
commit 807dec3b6c
4646 changed files with 163445 additions and 626017 deletions

View File

@@ -34,10 +34,10 @@ class AccessCode
AC_ACCESS_TEAM_DIRECTOR = '^(' . self::ACCESS_TEAM_DIRECTOR . ')(\d+)?$',
AC_ACCESS_TEAM_EMPLOYEE = '^(' . self::ACCESS_TEAM_EMPLOYEE . ')(\d+)?$',
AC_ACCESS_TEAM_DEPUTY = '^(' . self::ACCESS_TEAM_DEPUTY . ')(\d+)?$',
AC_STRUCTURE_TEAM = '^(SNT)(\d+)$',
AC_ALL_STRUCTURE_TEAM = '^(SNTR)(\d+)$',
AC_STRUCTURE_DEPARTMENT = '^(SND)(\d+)$',
AC_ALL_STRUCTURE_DEPARTMENT = '^(SNDR)(\d+)$';
AC_ALL_STRUCTURE_DEPARTMENT = '^(SNDR)(\d+)$',
AC_STRUCTURE_TEAM = '^(SNT)(\d+)$',
AC_ALL_STRUCTURE_TEAM = '^(SNTR)(\d+)$';
public const
TYPE_USER = 'users',
@@ -53,8 +53,8 @@ class AccessCode
TYPE_ACCESS_TEAM_DEPUTY = 'access_team_deputy',
TYPE_CHAT = 'chat',
TYPE_OTHER = 'other',
TYPE_STRUCTURE_TEAM = 'structureteams',
TYPE_STRUCTURE_DEPARTMENT = 'structuredepartments';
TYPE_STRUCTURE_DEPARTMENT = 'structuredepartments',
TYPE_STRUCTURE_TEAM = 'structureteams';
public static $map = [
self::AC_DEPARTMENT => self::TYPE_DEPARTMENT,
@@ -71,10 +71,10 @@ class AccessCode
self::AC_ACCESS_TEAM_DIRECTOR => self::TYPE_ACCESS_TEAM_DIRECTOR,
self::AC_ACCESS_TEAM_EMPLOYEE => self::TYPE_ACCESS_TEAM_EMPLOYEE,
self::AC_ACCESS_TEAM_DEPUTY => self::TYPE_ACCESS_TEAM_DEPUTY,
self::AC_STRUCTURE_DEPARTMENT => self::TYPE_STRUCTURE_DEPARTMENT,
self::AC_ALL_STRUCTURE_DEPARTMENT => self::TYPE_STRUCTURE_DEPARTMENT,
self::AC_STRUCTURE_TEAM => self::TYPE_STRUCTURE_TEAM,
self::AC_ALL_STRUCTURE_TEAM => self::TYPE_STRUCTURE_TEAM,
self::AC_STRUCTURE_DEPARTMENT => self::TYPE_STRUCTURE_DEPARTMENT,
self::AC_ALL_STRUCTURE_DEPARTMENT => self::TYPE_STRUCTURE_DEPARTMENT,
];
private $accessCode;

View File

@@ -8,10 +8,10 @@
namespace Bitrix\Main\Access\Entity;
use Bitrix\Main\Entity;
use Bitrix\Main\ORM\Query\Query;
use Bitrix\Main\ORM\Data;
class DataManager extends Entity\DataManager
class DataManager extends Data\DataManager
{
public static function deleteList(array $filter)
{
@@ -24,4 +24,4 @@ class DataManager extends Entity\DataManager
Query::buildFilterSql($entity, $filter)
));
}
}
}

View File

@@ -1,4 +1,5 @@
<?php
/**
* Bitrix Framework
* @package bitrix
@@ -8,12 +9,13 @@
namespace Bitrix\Main\Access\Permission;
use Bitrix\Main\Entity;
use Bitrix\Main\Localization\Loc;
use Bitrix\Main\NotSupportedException;
use Bitrix\Main\ORM\Data\Result;
use Bitrix\Main\ORM\Event;
use Bitrix\Main\Access\Entity\DataManager;
use Bitrix\Main\ORM\Fields;
use Bitrix\Main\ORM\EntityError;
Loc::loadMessages(__FILE__);
@@ -22,17 +24,17 @@ abstract class AccessPermissionTable extends DataManager
public static function getMap()
{
return [
new Entity\IntegerField('ID', [
new Fields\IntegerField('ID', [
'autocomplete' => true,
'primary' => true
]),
new Entity\IntegerField('ROLE_ID', [
new Fields\IntegerField('ROLE_ID', [
'required' => true
]),
new Entity\StringField('PERMISSION_ID', [
new Fields\StringField('PERMISSION_ID', [
'required' => true
]),
new Entity\IntegerField('VALUE', [
new Fields\IntegerField('VALUE', [
'required' => true
])
];
@@ -51,7 +53,7 @@ abstract class AccessPermissionTable extends DataManager
{
if (empty($primary))
{
$result->addError(new Entity\EntityError(Loc::getMessage('ACCESS_PERMISSION_PARENT_VALIDATE_ERROR')));
$result->addError(new EntityError(Loc::getMessage('ACCESS_PERMISSION_PARENT_VALIDATE_ERROR')));
return;
}
$data = static::loadUpdateRow($primary, $data);
@@ -59,7 +61,7 @@ abstract class AccessPermissionTable extends DataManager
if (!static::validateRow($data))
{
$result->addError(new Entity\EntityError(Loc::getMessage('ACCESS_PERMISSION_PARENT_VALIDATE_ERROR')));
$result->addError(new EntityError(Loc::getMessage('ACCESS_PERMISSION_PARENT_VALIDATE_ERROR')));
}
}
@@ -180,4 +182,4 @@ abstract class AccessPermissionTable extends DataManager
return true;
}
}
}

View File

@@ -1,4 +1,5 @@
<?php
/**
* Bitrix Framework
* @package bitrix
@@ -8,24 +9,24 @@
namespace Bitrix\Main\Access\Role;
use Bitrix\Main\Entity;
use Bitrix\Main\Access\Entity\DataManager;
use Bitrix\Main\ORM\Fields;
abstract class AccessRoleRelationTable extends DataManager
{
public static function getMap()
{
return [
new Entity\IntegerField('ID', [
new Fields\IntegerField('ID', [
'autocomplete' => true,
'primary' => true
]),
new Entity\IntegerField('ROLE_ID', [
new Fields\IntegerField('ROLE_ID', [
'required' => true
]),
new Entity\StringField('RELATION', [
new Fields\StringField('RELATION', [
'required' => true
])
];
}
}
}

View File

@@ -7,19 +7,19 @@
*/
namespace Bitrix\Main\Access\Role;
use Bitrix\Main\Entity;
use Bitrix\Main\Access\Entity\DataManager;
use Bitrix\Main\ORM\Fields;
abstract class AccessRoleTable extends DataManager
{
public static function getMap()
{
return [
new Entity\IntegerField('ID', [
new Fields\IntegerField('ID', [
'autocomplete' => true,
'primary' => true
]),
new Entity\StringField('NAME', [
new Fields\StringField('NAME', [
'required' => true,
])
];