From c4253a1fefee095dafdbb347e6df02bd47469f53 Mon Sep 17 00:00:00 2001
From: akshath <akshath.t@vtiger.com>
Date: Mon, 14 Jan 2019 12:59:14 +0530
Subject: [PATCH] Bug - Picklist editor failing to load
---
layouts/v7/modules/Settings/Workflows/resources/Edit.js | 4 ++--
modules/Settings/Picklist/models/Field.php | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/layouts/v7/modules/Settings/Workflows/resources/Edit.js b/layouts/v7/modules/Settings/Workflows/resources/Edit.js
index d999bb455..1a9aa44ed 100644
--- a/layouts/v7/modules/Settings/Workflows/resources/Edit.js
+++ b/layouts/v7/modules/Settings/Workflows/resources/Edit.js
@@ -110,7 +110,7 @@ Settings_Vtiger_Edit_Js("Settings_Workflows_Edit_Js", {
},
- getPopUp: function (container, flag) {
+ getPopUp: function (container) {
var thisInstance = this;
if (typeof container == 'undefined') {
container = thisInstance.getContainer();
@@ -811,7 +811,7 @@ Settings_Vtiger_Edit_Js("Settings_Workflows_Edit_Js", {
jQuery.each(fields, function (i, field) {
thisInstance.loadFieldSpecificUi(jQuery(field));
});
- this.getPopUp(jQuery('#saveTask'), true);
+ this.getPopUp(jQuery('#saveTask'));
},
registerVTPushNotificationTaskEvents: function () {
this.registerFillMailContentEvent();
diff --git a/modules/Settings/Picklist/models/Field.php b/modules/Settings/Picklist/models/Field.php
index 182d8054b..f7b64bd6b 100644
--- a/modules/Settings/Picklist/models/Field.php
+++ b/modules/Settings/Picklist/models/Field.php
@@ -102,7 +102,7 @@ class Settings_Picklist_Field_Model extends Vtiger_Field_Model {
* @param type $fieldName -- string
* @return type -- array of values
*/
- public static function getEditablePicklistValues($fieldName){
+ public function getEditablePicklistValues($fieldName){
$cache = Vtiger_Cache::getInstance();
$EditablePicklistValues = $cache->get('EditablePicklistValues', $fieldName);
if($EditablePicklistValues) {
--
GitLab