Pman.Dialog.CoreEnumMerge.bjs

[Pman.Core] / Pman.Dialog.CoreEnumMerge.js

diff --git a/Pman.Dialog.CoreEnumMerge.js b/Pman.Dialog.CoreEnumMerge.js
index ecb2fd4..f820544 100644 (file)
--- a/Pman.Dialog.CoreEnumMerge.js
+++ b/Pman.Dialog.CoreEnumMerge.js
@@ -7,13 +7,12 @@ Roo.namespace('Pman.Dialog');
 Pman.Dialog.CoreEnumMerge = {
 
  _strings : {
-  '99b344c8ae43e3e7213862b8f35c4e51' :"Select Company",
+  'bf8691517ce00a09186a05cd65863091' :"Select Item to Merge With",
   '298a183cfe4fddedd4bd17abe8aeb685' :"Merge Pulldown Option",
   '03e956f1dca2b4d525df03cb1899cb6f' :"Merge with",
   '1243daf593fa297e07ab03bf06d925af' :"Searching...",
   '68be4837f6c739877233e527a996dd00' :"Merge",
-  'ea4788705e6873b424c65e91c2846b19' :"Cancel",
-  '9675747b5ab12d05f18518761e68a533' :"Select Companies"
+  'ea4788705e6873b424c65e91c2846b19' :"Cancel"
  },
 
  dialog : false,
@@ -147,19 +146,19 @@ Pman.Dialog.CoreEnumMerge = {
           allowBlank : false,
           alwaysQuery : true,
           displayField : 'name',
-          emptyText : _this._strings['99b344c8ae43e3e7213862b8f35c4e51'] /* Select Company */,
+          emptyText : _this._strings['bf8691517ce00a09186a05cd65863091'] /* Select Item to Merge With */,
           fieldLabel : _this._strings['03e956f1dca2b4d525df03cb1899cb6f'] /* Merge with */,
           forceSelection : true,
-          hiddenName : 'merge_id',
+          hiddenName : '_merge_id',
           listWidth : 400,
           loadingText : _this._strings['1243daf593fa297e07ab03bf06d925af'] /* Searching... */,
           minChars : 2,
-          name : 'merge_id_name',
+          name : '_merge_id_name',
           pageSize : 20,
-          qtip : _this._strings['9675747b5ab12d05f18518761e68a533'] /* Select Companies */,
+          qtip : _this._strings['bf8691517ce00a09186a05cd65863091'] /* Select Item to Merge With */,
           queryParam : 'query[name]',
           selectOnFocus : true,
-          tpl : '<div class=\"x-grid-cell-text x-btn button\"><b>{name}</b> </div>',
+          tpl : '<div class=\"x-grid-cell-text x-btn button\"><b>{display_name}</b> {name}</div>',
           triggerAction : 'all',
           typeAhead : true,
           valueField : 'id',