Pman.Dialog.CoreCompanies.bjs

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

diff --git a/Pman.Dialog.CoreCompanies.js b/Pman.Dialog.CoreCompanies.js
index aa9f7e7..e9d51dc 100644 (file)
--- a/Pman.Dialog.CoreCompanies.js
+++ b/Pman.Dialog.CoreCompanies.js
@@ -37,7 +37,7 @@ Pman.Dialog.CoreCompanies = {
             height : 400,
             modal : true,
             shadow : 'true',
-            title : "Edit Companies",
+            title : "Add / Edit Organization",
             width : 750,
             items : [
                 {
@@ -68,11 +68,11 @@ Pman.Dialog.CoreCompanies = {
                                    
                                     if (act.type == 'load') {
                                         _this.data = act.result.data;
-                                        var meth = _this.data.isOwner || !Pman.Login.isOwner() ? 'disable' : 'enable';
+                                        var meth = _this.data.comptype == 'OWNER' ? 'disable' : 'enable';
                                      
                                             
-                                        if (_this.form.findField('comptype')) {
-                                            _this.form.findField('comptype')[meth]();
+                                        if (_this.form.findField('comptype_id')) {
+                                            _this.form.findField('comptype_id')[meth]();
                                         }
                                          
                                        // _this.loaded();
@@ -123,7 +123,7 @@ Pman.Dialog.CoreCompanies = {
                                                 }
                                             },
                                             alwaysQuery : true,
-                                            displayField : 'name',
+                                            displayField : 'display_name',
                                             emptyText : "Select Type",
                                             fieldLabel : 'Type',
                                             forceSelection : true,
@@ -131,12 +131,12 @@ Pman.Dialog.CoreCompanies = {
                                             listWidth : 250,
                                             loadingText : "Searching...",
                                             minChars : 2,
-                                            name : 'comptype_name',
+                                            name : 'comptype',
                                             pageSize : 20,
                                             qtip : "Select type",
                                             queryParam : 'query[name]',
                                             selectOnFocus : true,
-                                            tpl : '<div class="x-grid-cell-text x-btn button"><b>{name}</b> </div>',
+                                            tpl : '<div class="x-grid-cell-text x-btn button"><b>{name}</b> : {display_name}</div>',
                                             triggerAction : 'all',
                                             typeAhead : false,
                                             valueField : 'id',
@@ -220,7 +220,7 @@ Pman.Dialog.CoreCompanies = {
                                             xns: Roo.form,
                                             allowBlank : true,
                                             fieldLabel : 'Remarks',
-                                            height : 40,
+                                            height : 120,
                                             name : 'remarks',
                                             qtip : "Enter remarks",
                                             width : 300
@@ -234,7 +234,7 @@ Pman.Dialog.CoreCompanies = {
                                     width : 200,
                                     items : [
                                         {
-                                            xtype: 'TextField',
+                                            xtype: 'ColorField',
                                             xns: Roo.form,
                                             fieldLabel : 'Background Colour',
                                             name : 'background_color'
@@ -282,11 +282,6 @@ Pman.Dialog.CoreCompanies = {
                                         }
                                     ]
                                 },
-                                {
-                                    xtype: 'Hidden',
-                                    xns: Roo.form,
-                                    name : 'isOwner'
-                                },
                                 {
                                     xtype: 'Hidden',
                                     xns: Roo.form,