SuiteCRM 8.6.1 Release

salesagility · Jun 10, 2024 · f483bec · f483bec
1 parent 1a39227
commit f483bec
Show file tree

Hide file tree

Showing 25 changed files with 1,717 additions and 1,502 deletions.
diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
   <img width="180px" height="41px" src="https://suitecrm.com/wp-content/uploads/2017/12/logo.png" align="right" />
 </a>
 
-# SuiteCRM 8.6.0
+# SuiteCRM 8.6.1
 
 [![LICENSE](https://img.shields.io/github/license/suitecrm/suitecrm.svg)](https://github.com/salesagility/suitecrm/blob/hotfix/LICENSE.txt)
 [![contributions welcome](https://img.shields.io/badge/contributions-welcome-brightgreen.svg?style=flat)](https://github.com/salesagility/SuiteCRM-Core/issues)

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-8.6.0
+8.6.1
diff --git a/composer.json b/composer.json
@@ -87,7 +87,6 @@
     "tecnickcom/tcpdf": "^6.4",
     "tedivm/jshrink": "^1.3",
     "tinymce/tinymce": "^5.10",
-    "tuupola/slim-jwt-auth": "^2.0",
     "vlucas/phpdotenv": "^3.5",
     "voku/anti-xss": "^4.1",
     "webonyx/graphql-php": "^0.13.8",

diff --git a/composer.lock b/composer.lock
diff --git a/core/app/common/package.json b/core/app/common/package.json
@@ -1,6 +1,6 @@
 {
   "name": "common",
-  "version": "8.6.0",
+  "version": "8.6.1",
   "peerDependencies": {
     "@angular/common": "^12.1.0",
     "@angular/core": "^12.1.0",

diff --git a/core/app/common/src/lib/metadata/metadata.model.ts b/core/app/common/src/lib/metadata/metadata.model.ts
@@ -46,6 +46,8 @@ export interface ViewFieldDefinition {
     metadata?: FieldMetadata;
     logic?: FieldLogicMap;
     displayLogic?: FieldLogicMap;
+
+    [key: string]: any;
 }
 
 export interface Panel {

diff --git a/core/app/core/package.json b/core/app/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "core",
-  "version": "8.6.0",
+  "version": "8.6.1",
   "peerDependencies": {
     "@angular/common": "^12.1.0",
     "@angular/core": "^12.1.0",

diff --git a/core/app/core/src/lib/services/record/field/field.builder.ts b/core/app/core/src/lib/services/record/field/field.builder.ts
@@ -43,7 +43,7 @@ import {
 import {AsyncValidatorFn, UntypedFormArray, UntypedFormControl, ValidatorFn} from '@angular/forms';
 import {LanguageStore} from '../../../store/language/language.store';
 import get from 'lodash-es/get';
-import {merge} from 'lodash-es';
+import {isEmpty, merge} from 'lodash-es';
 import {FieldObjectRegistry} from "./field-object-type.registry";
 
 
@@ -69,7 +69,15 @@ export class FieldBuilder {
      */
     public buildField(record: Record, viewField: ViewFieldDefinition, language: LanguageStore = null): Field {
 
-        const definition = (viewField && viewField.fieldDefinition) || {} as FieldDefinition;
+        const module = record?.module ?? '';
+        let definition = viewField?.fieldDefinition ?? {} as FieldDefinition;
+        const multiModuleDefinitions = viewField?.multiModuleDefinitions ?? {} as ObjectMap;
+        const currentModuleDefinitions = multiModuleDefinitions[module] ?? {} as FieldDefinition;
+
+        if (!isEmpty(currentModuleDefinitions)){
+            definition = currentModuleDefinitions;
+        }
+
         const {value, valueList, valueObject} = this.parseValue(viewField, definition, record);
         const {validators, asyncValidators} = this.getSaveValidators(record, viewField);
 

diff --git a/core/backend/Install/LegacyHandler/InstallHandler.php b/core/backend/Install/LegacyHandler/InstallHandler.php
@@ -221,7 +221,7 @@ public function runCheckRouteAccess(array $inputArray): FeedBack
 
         $checkFile = __DIR__ . '/../../../../.curl_check_main_page';
 
-        require_once "core/backend/Install/Service/InstallPreChecks.php";
+        require_once __DIR__ . "/../../../../core/backend/Install/Service/InstallPreChecks.php";
         $installChecks = new InstallPreChecks($log);
 
         try {

diff --git a/core/backend/Install/Service/InstallationUtilsTrait.php b/core/backend/Install/Service/InstallationUtilsTrait.php
@@ -71,11 +71,16 @@ public function isAppInstallerLocked($legacyDir): bool
     public function getLegacyConfig($legacyDir): ?array
     {
         $sugarConfigFile = $legacyDir . '/config.php';
+        $sugarOverrideConfigFile = $legacyDir . '/config_override.php';
 
         if (is_file($sugarConfigFile)) {
             $sugar_config = [];
             include $sugarConfigFile;
 
+            if (is_file($sugarOverrideConfigFile)) {
+                include $sugarOverrideConfigFile;
+            }
+
             return $sugar_config;
         }