From e6331a66f47e59e41f620f872eeae68f5e331464 Mon Sep 17 00:00:00 2001 From: Prasad <prasad@vtiger.com> Date: Tue, 4 Oct 2022 00:25:24 +0530 Subject: [PATCH] Fixed: Function signature for call from templates --- include/Webservices/VtigerCRMObjectMeta.php | 4 ++-- .../CronTasks/ListViewRecordActions.tpl | 5 +---- modules/Migration/schema/600_to_610.php | 2 +- modules/Vtiger/models/RelationListView.php | 2 +- packages/vtiger/mandatory/PBXManager.zip | Bin 82525 -> 82518 bytes .../PBXManager/connectors/PBXManager.php | 2 +- .../PBXManager/settings/actions/SaveAjax.php | 2 +- .../PBXManager/settings/models/Record.php | 4 +--- 8 files changed, 8 insertions(+), 13 deletions(-) diff --git a/include/Webservices/VtigerCRMObjectMeta.php b/include/Webservices/VtigerCRMObjectMeta.php index b6bec1b2b..9e05b4d19 100644 --- a/include/Webservices/VtigerCRMObjectMeta.php +++ b/include/Webservices/VtigerCRMObjectMeta.php @@ -390,7 +390,7 @@ class VtigerCRMObjectMeta extends EntityMeta { $heirarchyUsers = get_user_array(false,"ACTIVE",$this->user->id); $groupUsers = vtws_getUsersInTheSameGroup($this->user->id); - $this->assignUsers = $heirarchyUsers+$groupUsers; + $this->assignUsers = array_merge($heirarchyUsers, $groupUsers); $this->assign = true; } @@ -568,4 +568,4 @@ class VtigerCRMObjectMeta extends EntityMeta { } } -?> \ No newline at end of file +?> diff --git a/layouts/v7/modules/Settings/CronTasks/ListViewRecordActions.tpl b/layouts/v7/modules/Settings/CronTasks/ListViewRecordActions.tpl index 13d02dca0..863930025 100644 --- a/layouts/v7/modules/Settings/CronTasks/ListViewRecordActions.tpl +++ b/layouts/v7/modules/Settings/CronTasks/ListViewRecordActions.tpl @@ -20,10 +20,7 @@ <a {if stripos($RECORD_LINK_URL, 'javascript:')===0} onclick="{$RECORD_LINK_URL|substr:strlen("javascript:")};if(event.stopPropagation){ldelim}event.stopPropagation();{rdelim}else{ldelim}event.cancelBubble=true;{rdelim}" {else} href='{$RECORD_LINK_URL}' {/if}> <i class="fa fa-pencil" title="{vtranslate($RECORD_LINK->getLabel(), $QUALIFIED_MODULE)}"></i> </a> - {if !$RECORD_LINK@lastui-sortable} - - {/if} {/foreach} </span> </div> -{/strip} \ No newline at end of file +{/strip} diff --git a/modules/Migration/schema/600_to_610.php b/modules/Migration/schema/600_to_610.php index 796046d64..5a4fb58ba 100644 --- a/modules/Migration/schema/600_to_610.php +++ b/modules/Migration/schema/600_to_610.php @@ -1257,7 +1257,7 @@ if(!defined('INSTALLATION_MODE')) { $recordModel->set('gateway', $qualifiedModuleName); $connector = new PBXManager_PBXManager_Connector; - foreach ($connector->getSettingsParameters() as $field => $type) { + foreach (PBXManager_PBXManager_Connector::getSettingsParameters() as $field => $type) { $fieldValue = ""; if ($field == "webappurl") { $fieldValue = "http://" . $server . ":"; diff --git a/modules/Vtiger/models/RelationListView.php b/modules/Vtiger/models/RelationListView.php index 582c2476a..6cf6eff3e 100644 --- a/modules/Vtiger/models/RelationListView.php +++ b/modules/Vtiger/models/RelationListView.php @@ -596,7 +596,7 @@ class Vtiger_RelationListView_Model extends Vtiger_Base_Model { return $updatedQuery; } - public function getCurrencySymbol($recordId, $fieldModel) { + public static function getCurrencySymbol($recordId, $fieldModel) { $db = PearDatabase::getInstance(); $moduleName = $fieldModel->getModuleName(); $fieldName = $fieldModel->get('name'); diff --git a/packages/vtiger/mandatory/PBXManager.zip b/packages/vtiger/mandatory/PBXManager.zip index e1bee3f72f8cde122f669b93bf5edf512cda2bf6..8466fcf6b37f7916cc4c6101270deab9d233a5c5 100644 GIT binary patch delta 12162 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 Lz(+R6h6ewC-M?Q; delta 11693 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 diff --git a/pkg/vtiger/modules/PBXManager/modules/PBXManager/connectors/PBXManager.php b/pkg/vtiger/modules/PBXManager/modules/PBXManager/connectors/PBXManager.php index 7982710fb..3484b385b 100644 --- a/pkg/vtiger/modules/PBXManager/modules/PBXManager/connectors/PBXManager.php +++ b/pkg/vtiger/modules/PBXManager/modules/PBXManager/connectors/PBXManager.php @@ -85,7 +85,7 @@ class PBXManager_PBXManager_Connector { * Function to get Settings edit view params * returns <array> */ - public function getSettingsParameters() { + public static function getSettingsParameters() { return self::$SETTINGS_REQUIRED_PARAMETERS; } diff --git a/pkg/vtiger/modules/PBXManager/settings/actions/SaveAjax.php b/pkg/vtiger/modules/PBXManager/settings/actions/SaveAjax.php index a514c5601..efdca0f17 100644 --- a/pkg/vtiger/modules/PBXManager/settings/actions/SaveAjax.php +++ b/pkg/vtiger/modules/PBXManager/settings/actions/SaveAjax.php @@ -23,7 +23,7 @@ class Settings_PBXManager_SaveAjax_Action extends Vtiger_SaveAjax_Action { } $connector = new PBXManager_PBXManager_Connector; - foreach ($connector->getSettingsParameters() as $field => $type) { + foreach (PBXManager_PBXManager_Connector::getSettingsParameters() as $field => $type) { $recordModel->set($field, $request->get($field)); } diff --git a/pkg/vtiger/modules/PBXManager/settings/models/Record.php b/pkg/vtiger/modules/PBXManager/settings/models/Record.php index 2520ff18b..e5706e36e 100644 --- a/pkg/vtiger/modules/PBXManager/settings/models/Record.php +++ b/pkg/vtiger/modules/PBXManager/settings/models/Record.php @@ -71,9 +71,7 @@ class Settings_PBXManager_Record_Model extends Settings_Vtiger_Record_Model { $db = PearDatabase::getInstance(); $parameters = array(); $selectedGateway = $this->get('gateway'); - $connector = new PBXManager_PBXManager_Connector; - - foreach ($connector->getSettingsParameters() as $field => $type) { + foreach (PBXManager_PBXManager_Connector::getSettingsParameters() as $field => $type) { $parameters[$field] = $this->get($field); } $this->set('parameters', Zend_Json::encode($parameters)); -- GitLab