Pman.Dialog.AdminEnumMerge.bjs

Pman.Dialog.AdminEnumMerge.js

diff --git a/Pman.Dialog.AdminEnumMerge.bjs b/Pman.Dialog.AdminEnumMerge.bjs
index e464f9d..113c7b5 100644 (file)
--- a/Pman.Dialog.AdminEnumMerge.bjs
+++ b/Pman.Dialog.AdminEnumMerge.bjs
@@ -63,7 +63,7 @@
          "Number listWidth" : 250,
          "width" : 250,
          "$ xns" : "Roo.form",
-         "name" : "industry_id_display_name",
+         "name" : "merge_display_name",
          "queryParam" : "query[search]",
          "tpl" : "<div class=\"x-grid-cell-text x-btn button\"><b>{display_name}</b> </div>",
          "items" : [

diff --git a/Pman.Dialog.AdminEnumMerge.js b/Pman.Dialog.AdminEnumMerge.js
index 0c6289e..fc9271b 100644 (file)
--- a/Pman.Dialog.AdminEnumMerge.js
+++ b/Pman.Dialog.AdminEnumMerge.js
@@ -186,7 +186,7 @@ Pman.Dialog.AdminEnumMerge = {
           hiddenName : 'industry_id',
           listWidth : 250,
           minChars : 2,
-          name : 'industry_id_display_name',
+          name : 'merge_display_name',
           pageSize : 50,
           queryParam : 'query[search]',
           selectOnFocus : true,