sync

[Pman.Admin] / Pman.Dialog.AdminWatch.js

diff --git a/Pman.Dialog.AdminWatch.js b/Pman.Dialog.AdminWatch.js
index e07a36b..f98c5c3 100644 (file)
--- a/Pman.Dialog.AdminWatch.js
+++ b/Pman.Dialog.AdminWatch.js
@@ -119,7 +119,7 @@ Pman.Dialog.AdminWatch = {
                                             {
                                                 o.params = o.params || {};
                                                 // staff can see all logs, other companies can only see their own.
-                                                if (Pman.Login.authUser.company_id_comptype != 'OWNER') {
+                                                if ((typeof(Pman.Login) != 'undefined') && Pman.Login.authUser.company_id_comptype != 'OWNER') {
                                                     o.params.company_id = Pman.Login.authUser.company_id;
                                                 }
                                                 o.params._distinct = 'on_table';
@@ -299,7 +299,7 @@ Pman.Dialog.AdminWatch = {
                                             xtype: 'HttpProxy',
                                             xns: Roo.data,
                                             method : 'GET',
-                                            url : baseURL + '/Roo/Person.php'
+                                            url : baseURL + '/Roo/core_person'
                                         },
                                         reader : {
                                             xtype: 'JsonReader',
@@ -327,7 +327,6 @@ Pman.Dialog.AdminWatch = {
                                     allowBlank : true,
                                     displayField : 'action',
                                     editable : true,
-                                    emptyText : "",
                                     fieldLabel : 'Match Event',
                                     forceSelection : false,
                                     listWidth : 300,
@@ -351,7 +350,7 @@ Pman.Dialog.AdminWatch = {
                                             {
                                                 o.params = o.params || {};
                                                 // staff can see all logs, other companies can only see their own.
-                                                if (Pman.Login.authUser.company_id_comptype != 'OWNER') {
+                                                if (typeof(Pman.Login) !='undefined' && Pman.Login.authUser.company_id_comptype != 'OWNER') {
                                                     o.params.company_id = Pman.Login.authUser.company_id;
                                                 }
                                                 o.params._distinct = 'action';
@@ -491,8 +490,9 @@ Pman.Dialog.AdminWatch = {
                                     xns: Roo.form,
                                     allowBlank : true,
                                     displayField : 'val',
-                                    editable : false,
+                                    editable : true,
                                     fieldLabel : 'Action',
+                                    forceSelection : false,
                                     listWidth : 200,
                                     name : 'medium',
                                     triggerAction : 'all',