DataObjects/Core_watch.php

[Pman.Core] / Pman.Dialog.CoreEnum.js

diff --git a/Pman.Dialog.CoreEnum.js b/Pman.Dialog.CoreEnum.js
index 3027fb1..12936bf 100644 (file)
--- a/Pman.Dialog.CoreEnum.js
+++ b/Pman.Dialog.CoreEnum.js
@@ -39,7 +39,7 @@ Pman.Dialog.CoreEnum = {
             background : true,
             closable : false,
             collapsible : false,
-            height : 100,
+            height : 150,
             modal : true,
             resizable : false,
             title : "Add / Edit Core Enum",
@@ -59,11 +59,17 @@ Pman.Dialog.CoreEnum = {
                                 actioncomplete : function (_self, action)
                                 {
                                   if (action.type == 'setdata') {
-                                       //_this.dialog.el.mask("Loading");
-                                       //this.load({ method: 'GET', params: { '_id' : _this.data.id }});
-                                       
-                                       // this is 'new' only!!!
                                 
+                                        if((typeof(_this.data.etype) == 'undefined') || !_this.data.etype.length){
+                                            Roo.MessageBox.alert('Error', 'Missing etype');
+                                            _this.dialog.hide();
+                                            return;
+                                        }
+                                  
+                                        if(_this.data.id){
+                                            _this.dialog.el.mask("Loading");
+                                            this.load({ method: 'GET', params: { '_id' : _this.data.id }}); 
+                                        }
                                        
                                        return;
                                     }
@@ -102,10 +108,30 @@ Pman.Dialog.CoreEnum = {
                                     xtype: 'TextField',
                                     xns: Roo.form,
                                     allowBlank : false,
-                                    fieldLabel : 'Industry Name',
+                                    fieldLabel : 'Display Name',
                                     name : 'display_name',
                                     width : 200
                                 },
+                                {
+                                    xtype: 'Checkbox',
+                                    xns: Roo.form,
+                                    fieldLabel : 'Active',
+                                    inputValue : 1,
+                                    name : 'active',
+                                    value : 0,
+                                    valueOff : 0
+                                },
+                                {
+                                    xtype: 'Hidden',
+                                    xns: Roo.form,
+                                    name : 'etype'
+                                },
+                                {
+                                    xtype: 'Hidden',
+                                    xns: Roo.form,
+                                    name : 'seqid',
+                                    value : 0
+                                },
                                 {
                                     xtype: 'Hidden',
                                     xns: Roo.form,
@@ -125,13 +151,13 @@ Pman.Dialog.CoreEnum = {
                 {
                     xtype: 'Button',
                     xns: Roo,
-                    text : "Cancel",
                     listeners : {
                         click : function() {
                             _this.form.reset();
                             _this.dialog.hide();
                         }
-                    }
+                    },
+                    text : "Cancel"
                 },
                 {
                     xtype: 'Button',
@@ -139,14 +165,13 @@ Pman.Dialog.CoreEnum = {
                     listeners : {
                         click : function() {
                         
-                            var name =     _this.form.findField('display_name').getValue();
+                            var name =     _this.form.findField('name').getValue();
                             name = name.toUpperCase().replace(/[^A-Z]+/g, '');
                             if (!name.length) {
                                 Roo.MessageBox.alert("Error","Please fill in a valid name");
                                 return;
                             }
                             _this.form.findField('name').setValue(name);
-                        
                          
                             _this.form.doAction('submit');