From 1d773aebff0ba757a6a5e71b8fd5ff1e80155908 Mon Sep 17 00:00:00 2001 From: Alan Knowles Date: Fri, 22 Jan 2016 13:26:54 +0800 Subject: [PATCH] Pman.Dialog.CoreEnumMerge.bjs Pman.Dialog.CoreEnumMerge.js --- Pman.Dialog.CoreEnumMerge.bjs | 2 +- Pman.Dialog.CoreEnumMerge.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Pman.Dialog.CoreEnumMerge.bjs b/Pman.Dialog.CoreEnumMerge.bjs index 2c60d1cf..a8460603 100644 --- a/Pman.Dialog.CoreEnumMerge.bjs +++ b/Pman.Dialog.CoreEnumMerge.bjs @@ -61,7 +61,7 @@ "pageSize" : 20, "displayField" : "name", "emptyText" : "Select Company", - "hiddenName" : "merge_id", + "hiddenName" : "_merge_with_id", "minChars" : 2, "valueField" : "id", "xtype" : "ComboBox", diff --git a/Pman.Dialog.CoreEnumMerge.js b/Pman.Dialog.CoreEnumMerge.js index ecb2fd4d..6676a238 100644 --- a/Pman.Dialog.CoreEnumMerge.js +++ b/Pman.Dialog.CoreEnumMerge.js @@ -150,7 +150,7 @@ Pman.Dialog.CoreEnumMerge = { emptyText : _this._strings['99b344c8ae43e3e7213862b8f35c4e51'] /* Select Company */, fieldLabel : _this._strings['03e956f1dca2b4d525df03cb1899cb6f'] /* Merge with */, forceSelection : true, - hiddenName : 'merge_id', + hiddenName : '_merge_with_id', listWidth : 400, loadingText : _this._strings['1243daf593fa297e07ab03bf06d925af'] /* Searching... */, minChars : 2, -- 2.39.2