sync

[Pman.Admin] / Pman.Dialog.AdminEnumMerge.js

diff --git a/Pman.Dialog.AdminEnumMerge.js b/Pman.Dialog.AdminEnumMerge.js
index caf024c..0e6f68e 100644 (file)
--- a/Pman.Dialog.AdminEnumMerge.js
+++ b/Pman.Dialog.AdminEnumMerge.js
@@ -12,6 +12,9 @@ Pman.Dialog.AdminEnumMerge = {
   'ea4788705e6873b424c65e91c2846b19' :"Cancel",
   'e0aa021e21dddbd6d8cecec71e9cf564' :"OK"
  },
+ _named_strings : {
+  'merge_display_name_fieldLabel' : '03e956f1dca2b4d525df03cb1899cb6f' /* Merge with */ 
+ },
 
  dialog : false,
  callback:  false,
@@ -184,6 +187,7 @@ Pman.Dialog.AdminEnumMerge = {
                  o.params.active = 1;
                  o.params.etype = _this.data.etype;
                  o.params['!id'] = _this.data.id;
+                 
              }
            },
            xns : Roo.data,