fix conflict

[Pman.Admin] / Pman.Tab.AdminEnum.js

diff --git a/Pman.Tab.AdminEnum.js b/Pman.Tab.AdminEnum.js
index e6dfa5a..264764a 100644 (file)
--- a/Pman.Tab.AdminEnum.js
+++ b/Pman.Tab.AdminEnum.js
@@ -91,7 +91,7 @@ Pman.Tab.AdminEnum = new Roo.XComponent({
                                                   method : 'POST',
                                                   params : {
                                                       id : record.data.id,
-                                                      etype : _this.etypeCombo.getValue(),
+                                                      etype : _this.grid.ds.getById(record.id).data.etype,
                                                       name : record.data.name,
                                                       active : record.data.active,
                                                       seqid : record.data.seqid,
@@ -253,6 +253,14 @@ Pman.Tab.AdminEnum = new Roo.XComponent({
                                          this.footer.onClick('first');
                                       }
                                   },
+                               celldblclick : function (_self, rowIndex, columnIndex, e)
+                                  {
+                                      var rec = _this.egrid.ds.getAt(rowIndex);
+                                      Pman.Dialog.AdminEnumType.show(rec.data,function(){
+                                          
+                                          _this.egrid.footer.onClick('first');
+                                      });
+                                  },
                                afteredit : function (e)
                                   {
                                      e.record.commit();     
@@ -340,7 +348,7 @@ Pman.Tab.AdminEnum = new Roo.XComponent({
                                                   method : 'POST',
                                                   params : {
                                                       id : record.data.id,
-                                                      etype : _this.etypeCombo.getValue(),
+                                                      etype : _this.grid.ds.getById(record.id).data.etype,
                                                       name : record.data.name,
                                                       active : record.data.active,
                                                       seqid : record.data.seqid,
@@ -691,9 +699,9 @@ Pman.Tab.AdminEnum = new Roo.XComponent({
 
                         },
                         '|xns' : 'Roo',
+                        fitToframe : true,
                         background : false,
                         region : 'center',
-                        fitToframe : true,
                         title : "Pulldown Options",
                         xtype : 'GridPanel',
                         xns : Roo,