Pman.Dialog.AdminEnumMerge.bjs

Pman.Dialog.AdminEnumMerge.js

diff --git a/Pman.Dialog.AdminEnumMerge.bjs b/Pman.Dialog.AdminEnumMerge.bjs
index 113c7b5..fe480e4 100644 (file)
--- a/Pman.Dialog.AdminEnumMerge.bjs
+++ b/Pman.Dialog.AdminEnumMerge.bjs
@@ -56,7 +56,7 @@
          "selectOnFocus" : true,
          "xtype" : "ComboBox",
          "minChars" : 2,
-         "hiddenName" : "industry_id",
+         "hiddenName" : "_merge_id",
          "displayField" : "display_name",
          "valueField" : "id",
          "editable" : true,

diff --git a/Pman.Dialog.AdminEnumMerge.js b/Pman.Dialog.AdminEnumMerge.js
index fc9271b..63b2644 100644 (file)
--- a/Pman.Dialog.AdminEnumMerge.js
+++ b/Pman.Dialog.AdminEnumMerge.js
@@ -183,7 +183,7 @@ Pman.Dialog.AdminEnumMerge = {
           editable : true,
           fieldLabel : 'Merge with',
           forceSelection : true,
-          hiddenName : 'industry_id',
+          hiddenName : '_merge_id',
           listWidth : 250,
           minChars : 2,
           name : 'merge_display_name',