projects
/
Pman.Core
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Pman.js
[Pman.Core]
/
Pman.Dialog.CoreEnumMerge.bjs
diff --git
a/Pman.Dialog.CoreEnumMerge.bjs
b/Pman.Dialog.CoreEnumMerge.bjs
index
49fe929
..
f9c58b2
100644
(file)
--- a/
Pman.Dialog.CoreEnumMerge.bjs
+++ b/
Pman.Dialog.CoreEnumMerge.bjs
@@
-2,15
+2,16
@@
"name" : "Pman.Dialog.CoreEnumMerge",
"parent" : "",
"title" : "",
"name" : "Pman.Dialog.CoreEnumMerge",
"parent" : "",
"title" : "",
- "path" : "/home/
alan/gitlive
/Pman.Core/Pman.Dialog.CoreEnumMerge.bjs",
+ "path" : "/home/
benny/gitlive/web.hhyc_membership_system
/Pman.Core/Pman.Dialog.CoreEnumMerge.bjs",
"permname" : "",
"modOrder" : "001",
"strings" : {
"permname" : "",
"modOrder" : "001",
"strings" : {
- "
bf8691517ce00a09186a05cd65863091" : "Select Item to Merge With
",
+ "
8324cdec05065c4bd7d8c5effdf43edf" : "Delete this
",
"298a183cfe4fddedd4bd17abe8aeb685" : "Merge Pulldown Option",
"298a183cfe4fddedd4bd17abe8aeb685" : "Merge Pulldown Option",
- "
03e956f1dca2b4d525df03cb1899cb6f" : "Merge w
ith",
+ "
bf8691517ce00a09186a05cd65863091" : "Select Item to Merge W
ith",
"1243daf593fa297e07ab03bf06d925af" : "Searching...",
"68be4837f6c739877233e527a996dd00" : "Merge",
"1243daf593fa297e07ab03bf06d925af" : "Searching...",
"68be4837f6c739877233e527a996dd00" : "Merge",
+ "266459bee8ed1ca2e0464899e1ef0994" : "And replace with",
"ea4788705e6873b424c65e91c2846b19" : "Cancel"
},
"items" : [
"ea4788705e6873b424c65e91c2846b19" : "Cancel"
},
"items" : [
@@
-22,11
+23,11
@@
"collapsible" : false,
"title" : "Merge Pulldown Option",
"xtype" : "LayoutDialog",
"collapsible" : false,
"title" : "Merge Pulldown Option",
"xtype" : "LayoutDialog",
- "width" : 4
0
0,
+ "width" : 4
5
0,
"$ xns" : "Roo",
"closable" : false,
"resizable" : false,
"$ xns" : "Roo",
"closable" : false,
"resizable" : false,
- "height" : 1
2
0,
+ "height" : 1
6
0,
"items" : [
{
"xtype" : "LayoutRegion",
"items" : [
{
"xtype" : "LayoutRegion",
@@
-41,7
+42,7
@@
{
"listeners" : {
"actionfailed" : "function (_self, action)\n{\n \n Pman.standardActionFailed(_self, action);\n}\n",
{
"listeners" : {
"actionfailed" : "function (_self, action)\n{\n \n Pman.standardActionFailed(_self, action);\n}\n",
- "actioncomplete" : "function (_self, action)\n{\n\n if (action.type =='submit') {\n \n _this.dialog.hide();\n \n if (_this.callback) {\n _this.callback.call(_this, _this.form.getValues());\n }\n _this.form.reset();\n return;\n }\n if (action.type == 'setdata') {\n \n var title = _this.data.title || _this.data.etype;\n _this.dialog.setTitle(\"Delete selected \" + title + \" and merge data with\");\n
\n
return;\n }\n \n}\n",
+ "actioncomplete" : "function (_self, action)\n{\n\n if (action.type =='submit') {\n \n _this.dialog.hide();\n \n if (_this.callback) {\n _this.callback.call(_this, _this.form.getValues());\n }\n _this.form.reset();\n return;\n }\n if (action.type == 'setdata') {\n \n var title = _this.data.title || _this.data.etype;\n _this.dialog.setTitle(\"Delete selected \" + title + \" and merge data with\");\n
\n\n if(typeof(_this.data._ids) == \"undefined\"){\n this.load({ method: 'GET', params: { '_id' : _this.data.id }}); \n return;\n }\n _this.form.findField('_names').setValue(_this.data._names);\n _this.form.findField('_ids').setValue(_this.data._ids);\n
return;\n }\n \n}\n",
"rendered" : "function (form)\n{\n _this.form = form;\n}"
},
"$ url" : "baseURL + '/Roo/Core_enum.php'",
"rendered" : "function (form)\n{\n _this.form = form;\n}"
},
"$ url" : "baseURL + '/Roo/Core_enum.php'",
@@
-49,12
+50,21
@@
"xtype" : "Form",
"style" : "margin: 10px;",
"$ xns" : "Roo.form",
"xtype" : "Form",
"style" : "margin: 10px;",
"$ xns" : "Roo.form",
+ "Number labelWidth" : 120,
"items" : [
"items" : [
+ {
+ "String name" : "_names",
+ "Number width" : 250,
+ "Boolean readOnly" : true,
+ "xtype" : "TextField",
+ "String fieldLabel" : "Delete this",
+ "$ xns" : "Roo.form"
+ },
{
"alwaysQuery" : true,
"listWidth" : 400,
"triggerAction" : "all",
{
"alwaysQuery" : true,
"listWidth" : 400,
"triggerAction" : "all",
- "fieldLabel" : "
Merg
e with",
+ "fieldLabel" : "
And replac
e with",
"forceSelection" : true,
"selectOnFocus" : true,
"pageSize" : 20,
"forceSelection" : true,
"selectOnFocus" : true,
"pageSize" : 20,
@@
-109,6
+119,11
@@
"$ xns" : "Roo.form",
"name" : "etype"
},
"$ xns" : "Roo.form",
"name" : "etype"
},
+ {
+ "xtype" : "Hidden",
+ "$ xns" : "Roo.form",
+ "name" : "_ids"
+ },
{
"xtype" : "Hidden",
"$ xns" : "Roo.form",
{
"xtype" : "Hidden",
"$ xns" : "Roo.form",