projects
/
Pman.Core
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
hide popup message if failure is handled - not sure what knock on effect this may...
[Pman.Core]
/
Pman.Dialog.CoreEnumMerge.js
diff --git
a/Pman.Dialog.CoreEnumMerge.js
b/Pman.Dialog.CoreEnumMerge.js
index
8076dc9
..
3e8d841
100644
(file)
--- a/
Pman.Dialog.CoreEnumMerge.js
+++ b/
Pman.Dialog.CoreEnumMerge.js
@@
-129,9
+129,14
@@
Pman.Dialog.CoreEnumMerge = {
var title = _this.data.title || _this.data.etype;
_this.dialog.setTitle("Delete selected " + title + " and merge data with");
var title = _this.data.title || _this.data.etype;
_this.dialog.setTitle("Delete selected " + title + " and merge data with");
+
+
+ if(typeof(_this.data._ids) == "undefined"){
+ this.load({ method: 'GET', params: { '_id' : _this.data.id }});
+ return;
+ }
+ _this.form.findField('_names').setValue(_this.data._names);
_this.form.findField('_ids').setValue(_this.data._ids);
_this.form.findField('_ids').setValue(_this.data._ids);
- _this.form.findField('_names').setValue(_this.data.countrylist);
- this.load({ method: 'GET', params: { '_id' : _this.data.id }});
return;
}
return;
}
@@
-222,6
+227,12
@@
Pman.Dialog.CoreEnumMerge = {
xns : Roo.form,
'|xns' : 'Roo.form'
},
xns : Roo.form,
'|xns' : 'Roo.form'
},
+ {
+ xtype : 'Hidden',
+ name : '_ids',
+ xns : Roo.form,
+ '|xns' : 'Roo.form'
+ },
{
xtype : 'Hidden',
name : 'id',
{
xtype : 'Hidden',
name : 'id',