Bug - Picklist editor failing to load

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();

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) {