zloj/ez-pro
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

32
core/bitrix/modules/main/lib/ui/copyright.php
View File

@@ -797,12 +797,6 @@ In addition to the Google Terms of Service (http://www.google.com/accounts/TOS),
->setCopyright("Copyright 2012 The Apache Software Foundation")
->setLicence(static::LICENCE_APACHE2),
// faceid/install/components/bitrix/faceid.tracker/templates/.default/smoother.js
// faceid/install/js/faceid/WebPhotoMaker/smoother.js
(new static("Smoother"))
->setCopyright("Copyright 2014 Martin Tschirsich")
->setLicence(static::LICENCE_MIT),
// ui/install/js/ui/fonts/comforter-brush
(new static("Font Comforter Brush"))
->setCopyright("Copyright 2015 The Comforter Brush Project Authors")
@@ -862,6 +856,32 @@ In addition to the Google Terms of Service (http://www.google.com/accounts/TOS),
->setProductUrl('https://github.com/simshaun/recurr')
->setLicence(static::LICENCE_MIT)
->setLicenceUrl('https://github.com/simshaun/recurr/blob/master/LICENSE'),
// mobile/install/mobileapp/mobile/extensions/bitrix/statemanager/redux
(new static('Redux Toolkit'))
->setCopyright('Copyright (c) 2018 Mark Erikson')
->setProductUrl('https://redux-toolkit.js.org')
->setLicence(Copyright::LICENCE_MIT),
(new static('Redux-State-Sync 3'))
->setCopyright('Copyright (c) 2018 MU AOHUA')
->setProductUrl('https://github.com/AOHUA/redux-state-sync')
->setLicence(Copyright::LICENCE_MIT),
(new static('Logger for Redux'))
->setCopyright('Copyright (c) 2016 Eugene Rodionov')
->setProductUrl('https://github.com/LogRocket/redux-logger')
->setLicence(Copyright::LICENCE_MIT),
(new static('redux-batched-subscribe'))
->setCopyright('Copyright (c) 2016 Terry Appleby')
->setProductUrl('https://github.com/tappleby/redux-batched-subscribe')
->setLicence(Copyright::LICENCE_MIT),
(new static('redux-batched-actions'))
->setCopyright('Copyright (c) 2016 Tim Shelburne')
->setProductUrl('https://github.com/tshelburne/redux-batched-actions')
->setLicence(Copyright::LICENCE_MIT),
];
}
}

11
core/bitrix/modules/main/lib/ui/pagenavigation.php
View File

@@ -54,11 +54,14 @@ class PageNavigation
if(($value = $request->getQuery($this->id)) !== null)
{
//parameters are in the QUERY_STRING
$params = explode("-", $value);
for($i = 0, $n = count($params); $i < $n; $i += 2)
if (is_string($value))
{
$navParams[$params[$i]] = $params[$i+1];
//parameters are in the QUERY_STRING
$params = explode("-", $value);
for($i = 0, $n = count($params); $i < $n; $i += 2)
{
$navParams[$params[$i]] = $params[$i+1];
}
}
}
else

7
core/bitrix/modules/main/lib/ui/selector/entities.php
View File

@@ -8,6 +8,7 @@ use Bitrix\Main\Localization\Loc;
use Bitrix\Main\ModuleManager;
use Bitrix\Main\FinderDestTable;
use Bitrix\Main\Loader;
use Bitrix\Main\ORM\Fields\ExpressionField;
class Entities
{
@@ -281,6 +282,8 @@ class Entities
public static function getLastSort($params = array())
{
global $USER;
$result = array(
'DATA' => array(),
'DATA_ADDITIONAL' => array()
@@ -392,7 +395,7 @@ class Entities
$helper = $conn->getSqlHelper();
$runtime = array(
new \Bitrix\Main\Entity\ExpressionField('CONTEXT_SORT', "CASE WHEN CONTEXT = '".$helper->forSql(mb_strtoupper($params["DEST_CONTEXT"]))."' THEN 1 ELSE 0 END")
new ExpressionField('CONTEXT_SORT', "CASE WHEN CONTEXT = '".$helper->forSql(mb_strtoupper($params["DEST_CONTEXT"]))."' THEN 1 ELSE 0 END")
);
$order = array(
@@ -767,7 +770,7 @@ class Entities
{
$selectList[] = 'UF_USER_CRM_ENTITY';
}
$selectList[] = new \Bitrix\Main\Entity\ExpressionField('MAX_LAST_USE_DATE', 'MAX(%s)', array('\Bitrix\Main\FinderDest:CODE_USER_CURRENT.LAST_USE_DATE'));
$selectList[] = new ExpressionField('MAX_LAST_USE_DATE', 'MAX(%s)', array('\Bitrix\Main\FinderDest:CODE_USER_CURRENT.LAST_USE_DATE'));
$res = \Bitrix\Main\UserTable::getList(array(
'order' => array(

26
core/bitrix/modules/main/lib/ui/viewer/filepreviewtable.php
View File

@@ -1,9 +1,9 @@
<?
<?php
namespace Bitrix\Main\UI\Viewer;
use Bitrix\Main\ORM\Data\DataManager;
use Bitrix\Main\Entity;
use Bitrix\Main\ORM\Fields;
use Bitrix\Main\FileTable;
use Bitrix\Main\ORM\Event;
use Bitrix\Main\Type\Date;
@@ -42,41 +42,43 @@ final class FilePreviewTable extends DataManager
/**
* Returns entity map definition.
* To get initialized fields @see \Bitrix\Main\Entity\Base::getFields() and \Bitrix\Main\Entity\Base::getField()
* To get initialized fields
* @return array
* @throws \Bitrix\Main\SystemException
* @see \Bitrix\Main\ORM\Entity::getFields()
* @see \Bitrix\Main\ORM\Entity::getField()
*/
public static function getMap()
{
return [
new Entity\IntegerField('ID', [
new Fields\IntegerField('ID', [
'primary' => true,
'autocomplete' => true,
]),
new Entity\IntegerField('FILE_ID', [
new Fields\IntegerField('FILE_ID', [
'required' => true,
]),
new Entity\IntegerField('PREVIEW_ID'),
new Entity\IntegerField('PREVIEW_IMAGE_ID'),
new Entity\DatetimeField('CREATED_AT', [
new Fields\IntegerField('PREVIEW_ID'),
new Fields\IntegerField('PREVIEW_IMAGE_ID'),
new Fields\DatetimeField('CREATED_AT', [
'default_value' => function () {
return new DateTime();
},
]),
new Entity\DatetimeField('TOUCHED_AT', [
new Fields\DatetimeField('TOUCHED_AT', [
'default_value' => function () {
return new DateTime();
},
]),
new Entity\ReferenceField('FILE',FileTable::class,
new Fields\Relations\Reference('FILE',FileTable::class,
['=this.FILE_ID' => 'ref.ID'],
['join_type' => 'INNER']
),
new Entity\ReferenceField('PREVIEW',FileTable::class,
new Fields\Relations\Reference('PREVIEW',FileTable::class,
['=this.PREVIEW_ID' => 'ref.ID'],
['join_type' => 'LEFT']
),
new Entity\ReferenceField('PREVIEW_IMAGE',FileTable::class,
new Fields\Relations\Reference('PREVIEW_IMAGE',FileTable::class,
['=this.PREVIEW_IMAGE_ID' => 'ref.ID'],
['join_type' => 'LEFT']
),