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.bjs
diff --git
a/Pman.Dialog.AdminCompanyMerge.bjs
b/Pman.Dialog.AdminCompanyMerge.bjs
index
dfbf534
..
1ffaa3a
100644
(file)
--- a/
Pman.Dialog.AdminCompanyMerge.bjs
+++ b/
Pman.Dialog.AdminCompanyMerge.bjs
@@
-95,7
+95,7
@@
"id" : "id",
"root" : "data",
"xtype" : "JsonReader",
"id" : "id",
"root" : "data",
"xtype" : "JsonReader",
- "$ fields" : "[
{
\"name\":\"id\",\"type\":\"int\"},{\"name\":\"name\",\"type\":\"string\"}]",
+ "$ fields" : "[
\n {\n
\"name\":\"id\",\"type\":\"int\"},{\"name\":\"name\",\"type\":\"string\"}]",
"$ xns" : "Roo.data",
"* prop" : "reader",
"totalProperty" : "total"
"$ xns" : "Roo.data",
"* prop" : "reader",
"totalProperty" : "total"