Pman.Dialog.AdminEnumMerge.bjs

Pman.Dialog.AdminEnumMerge.js

diff --git a/Pman.Dialog.AdminEnumMerge.bjs b/Pman.Dialog.AdminEnumMerge.bjs
index ad8f384..140653e 100644 (file)
--- a/Pman.Dialog.AdminEnumMerge.bjs
+++ b/Pman.Dialog.AdminEnumMerge.bjs
@@ -74,7 +74,7 @@
            "xtype" : "Store",
            "remoteSort" : true,
            "$ xns" : "Roo.data",
-           "$ sortInfo" : "{ direction : 'ASC', field: 'id' }",
+           "$ sortInfo" : "{ direction : 'ASC', field: 'name' }",
            "* prop" : "store",
            "items" : [
             {
@@ -89,7 +89,7 @@
              "root" : "data",
              "xtype" : "JsonReader",
              "$ xns" : "Roo.data",
-             "$ fields" : "[\n    {\n        \"name\":\"name\",\n        \"type\":\"string\"\n    },\n    {\n        \"name\":\"display_name\",\n        \"type\":\"string\"\n    }\n]",
+             "$ fields" : "[\n    {\n        \"name\":\"id\",\n        \"type\":\"int\"\n    },\n    {\n        \"name\":\"display_name\",\n        \"type\":\"string\"\n    }\n]",
              "* prop" : "reader",
              "totalProperty" : "total"
             }

diff --git a/Pman.Dialog.AdminEnumMerge.js b/Pman.Dialog.AdminEnumMerge.js
index c4bba97..d4052f5 100644 (file)
--- a/Pman.Dialog.AdminEnumMerge.js
+++ b/Pman.Dialog.AdminEnumMerge.js
@@ -144,8 +144,8 @@ Pman.Dialog.AdminEnumMerge = {
             '|xns' : 'Roo.data',
             fields : [
                 {
-                    "name":"name",
-                    "type":"string"
+                    "name":"id",
+                    "type":"int"
                 },
                 {
                     "name":"display_name",
@@ -160,7 +160,7 @@ Pman.Dialog.AdminEnumMerge = {
            },
            '|xns' : 'Roo.data',
            remoteSort : true,
-           sortInfo : { direction : 'ASC', field: 'id' },
+           sortInfo : { direction : 'ASC', field: 'name' },
            xns : Roo.data,
            xtype : 'Store',
            listeners : {