espocrm-extensions/espocrm-base
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'stable'

Browse Source
This commit is contained in:
Yuri Kuznetsov
2025-05-29 10:09:49 +03:00
parent e959df5177 acf5c2984d
commit 8e454fd5b7
7 changed files with 36 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gruntfile.js
+6 -2
View File
@@ -184,8 +184,12 @@ module.exports = grunt => {
comments: /^!/,
},
beautify: false,
mangle: true,
compress: true
compress: {
sequences: false,
collapse_vars: false,
keep_fargs: true,
webkit: true,
},
},
bundle: {
options: {
application/Espo/ORM/QueryComposer/PostgresqlQueryComposer.php
+2 -2
View File
@@ -196,10 +196,10 @@ class PostgresqlQueryComposer extends BaseQueryComposer
$minutes = (int) (floatval($offsetHoursString) * 60);
$minutesString = (string) $minutes;
return "$argumentPartList[0] + INTERVAL 'MINUTE $minutesString'";
return "$argumentPartList[0] + INTERVAL '$minutesString MINUTE'";
}
return "$argumentPartList[0] + INTERVAL 'HOUR $offsetHoursString'";
return "$argumentPartList[0] + INTERVAL '$offsetHoursString HOUR'";
}
if ($function === 'POSITION_IN_LIST') {
client/src/views/fields/base.js
+2 -1
View File
@@ -875,7 +875,7 @@ class BaseFieldView extends View {
this.attributeList = this.getAttributeList(); // for backward compatibility, to be removed
this.listenTo(this.model, 'change', (model, options) => {
if (options.ui) {
if (options.ui && (!options.fromField || options.fromField === this.name)) {
return;
}
@@ -950,6 +950,7 @@ class BaseFieldView extends View {
this.model.set(attributes, {
ui: true,
fromView: this,
fromField: this.name,
action: 'ui',
});
});
frontend/less/espo/elements/modal.less
+20 -7
View File
@@ -214,13 +214,26 @@
}
}
.modal-dialog .modal-body .list-sticky-bar {
top: var(--94px) !important;
width: 100% !important;
right: 0 !important;
left: unset !important;
padding-left: calc(var(--container-padding) - var(--1px));
padding-right: calc(var(--container-padding) - var(--1px) + var(--scroll-width));
.modal-dialog {
.modal-body {
.list-sticky-bar {
top: var(--94px) !important;
width: 100% !important;
right: 0 !important;
left: unset !important;
padding-left: calc(var(--container-padding) - var(--1px));
padding-right: calc(var(--container-padding) - var(--1px) + var(--scroll-width));
}
}
&:not(:has(footer.modal-footer)) {
.modal-body {
.list-sticky-bar {
top: var(--43px) !important;
}
}
}
}
@media screen and (max-width: @screen-xs-max) {
package-lock.json
Generated
+2 -2
View File
@@ -1,12 +1,12 @@
{
"name": "espocrm",
"version": "9.1.4",
"version": "9.1.5",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "espocrm",
"version": "9.1.4",
"version": "9.1.5",
"hasInstallScript": true,
"license": "AGPL-3.0-or-later",
"dependencies": {
package.json
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "espocrm",
"version": "9.1.4",
"version": "9.1.5",
"description": "Open-source CRM.",
"repository": {
"type": "git",
tests/unit/Espo/ORM/PostgresqlQueryComposerTest.php
+3 -3
View File
@@ -296,7 +296,7 @@ class PostgresqlQueryComposerTest extends \PHPUnit\Framework\TestCase
$sql = $this->queryComposer->composeSelect($query);
$expectedSql =
'SELECT "comment"."created_at" + INTERVAL \'MINUTE 330\' AS "createdAt" ' .
'SELECT "comment"."created_at" + INTERVAL \'330 MINUTE\' AS "createdAt" ' .
'FROM "comment"';
$this->assertEquals($expectedSql, $sql);
@@ -319,7 +319,7 @@ class PostgresqlQueryComposerTest extends \PHPUnit\Framework\TestCase
$sql = $this->queryComposer->composeSelect($query);
$expectedSql =
'SELECT "comment"."created_at" + INTERVAL \'MINUTE -330\' AS "createdAt" ' .
'SELECT "comment"."created_at" + INTERVAL \'-330 MINUTE\' AS "createdAt" ' .
'FROM "comment"';
$this->assertEquals($expectedSql, $sql);
@@ -342,7 +342,7 @@ class PostgresqlQueryComposerTest extends \PHPUnit\Framework\TestCase
$sql = $this->queryComposer->composeSelect($query);
$expectedSql =
'SELECT "comment"."created_at" + INTERVAL \'HOUR 5\' AS "createdAt" ' .
'SELECT "comment"."created_at" + INTERVAL \'5 HOUR\' AS "createdAt" ' .
'FROM "comment"';
$this->assertEquals($expectedSql, $sql);