From 618a56c0b3abd0af00a91f60f7f82a5a20a8c968 Mon Sep 17 00:00:00 2001
From: Uma <uma.s@vtiger.com>
Date: Tue, 19 May 2020 20:50:58 +0530
Subject: [PATCH] Fixes Settings page warnings
---
modules/Settings/Profiles/views/EditAjax.php | 2 +-
modules/Settings/SharingAccess/models/Module.php | 2 +-
modules/Settings/Vtiger/models/Systems.php | 2 +-
modules/Settings/Vtiger/views/IndexAjax.php | 2 +-
pkg/vtiger/modules/Webforms/settings/models/Field.php | 4 ++--
5 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/modules/Settings/Profiles/views/EditAjax.php b/modules/Settings/Profiles/views/EditAjax.php
index 45f0a0f33..6dbd41aba 100644
--- a/modules/Settings/Profiles/views/EditAjax.php
+++ b/modules/Settings/Profiles/views/EditAjax.php
@@ -10,7 +10,7 @@
Class Settings_Profiles_EditAjax_View extends Settings_Profiles_Edit_View {
- public function preProcess(Vtiger_Request $request) {
+ public function preProcess(Vtiger_Request $request, $display=true) {
return true;
}
diff --git a/modules/Settings/SharingAccess/models/Module.php b/modules/Settings/SharingAccess/models/Module.php
index bce41635c..0c2c54b3e 100644
--- a/modules/Settings/SharingAccess/models/Module.php
+++ b/modules/Settings/SharingAccess/models/Module.php
@@ -109,7 +109,7 @@ class Settings_SharingAccess_Module_Model extends Vtiger_Module_Model {
* Static Function to get the instance of Vtiger Module Model for all the modules
* @return <Array> - List of Vtiger Module Model or sub class instances
*/
- public static function getAll($editable=false) {
+ public static function getAll($presence = array(), $restrictedModulesList = array(), $editable=false) {
$db = PearDatabase::getInstance();
$moduleModels = array();
diff --git a/modules/Settings/Vtiger/models/Systems.php b/modules/Settings/Vtiger/models/Systems.php
index ebb4fba7b..d36d27fcc 100644
--- a/modules/Settings/Vtiger/models/Systems.php
+++ b/modules/Settings/Vtiger/models/Systems.php
@@ -21,7 +21,7 @@ class Settings_Vtiger_Systems_Model extends Vtiger_Base_Model{
return ($smtp_auth_value == 'on' || $smtp_auth_value == 1 || $smtp_auth_value == 'true') ? true : false;
}
- public function save() {
+ public function save($request) {
$db = PearDatabase::getInstance();
$id = $this->getId();
diff --git a/modules/Settings/Vtiger/views/IndexAjax.php b/modules/Settings/Vtiger/views/IndexAjax.php
index 77169d555..ccb34249f 100644
--- a/modules/Settings/Vtiger/views/IndexAjax.php
+++ b/modules/Settings/Vtiger/views/IndexAjax.php
@@ -14,7 +14,7 @@ class Settings_Vtiger_IndexAjax_View extends Settings_Vtiger_Index_View {
$this->exposeMethod('getSettingsShortCutBlock');
}
- public function preProcess (Vtiger_Request $request) {
+ public function preProcess (Vtiger_Request $request, $display=true) {
return;
}
diff --git a/pkg/vtiger/modules/Webforms/settings/models/Field.php b/pkg/vtiger/modules/Webforms/settings/models/Field.php
index eb1383223..1190f6770 100644
--- a/pkg/vtiger/modules/Webforms/settings/models/Field.php
+++ b/pkg/vtiger/modules/Webforms/settings/models/Field.php
@@ -82,7 +82,7 @@ class Settings_Webforms_Field_Model extends Vtiger_Field_Model {
return $this->getPicklistValues();
}
- public function getDisplayValue($value) {
+ public function getDisplayValue($value, $record=false, $recordInstance = false) {
if ($this->getName() === 'enabled') {
$moduleName = 'Settings:Webforms';
if ($value) {
@@ -93,7 +93,7 @@ class Settings_Webforms_Field_Model extends Vtiger_Field_Model {
return parent::getDisplayValue($value);
}
- public function getPermissions() {
+ public function getPermissions($accessmode = false) {
return true;
}
--
GitLab