projects
/
Pman.Admin
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Pman.Dialog.AdminCompanyMerge.bjs
[Pman.Admin]
/
Pman.Dialog.AdminCompanyMerge.js
diff --git
a/Pman.Dialog.AdminCompanyMerge.js
b/Pman.Dialog.AdminCompanyMerge.js
index
c6233c0
..
eda4557
100644
(file)
--- a/
Pman.Dialog.AdminCompanyMerge.js
+++ b/
Pman.Dialog.AdminCompanyMerge.js
@@
-187,7
+187,14
@@
Pman.Dialog.AdminCompanyMerge = {
xtype : 'JsonReader',
fields : [
{
- "name":"id","type":"int"},{"name":"name","type":"string"}],
+ "name":"id",
+ "type":"int"
+ },
+ {
+ "name":"name",
+ "type":"string"
+ }
+ ],
id : 'id',
root : 'data',
totalProperty : 'total',