From: Alan Knowles <alan@roojs.com>
Date: Tue, 28 Mar 2017 08:46:13 +0000 (+0800)
Subject: Pman.Dialog.AdminWatch.bjs
X-Git-Url: http://git.roojs.org/?p=Pman.Admin;a=commitdiff_plain;h=e358845a2737e353ec079038a05ccbb702a4b904

Pman.Dialog.AdminWatch.bjs
Pman.Dialog.AdminWatch.js
Pman.Dialog.Groups.js
Pman.Tab.AdminContacts.bjs
Pman.Tab.AdminContacts.js
Pman.Tab.AdminLogEvents.bjs
Pman.Tab.AdminLogEvents.js
Pman.Tab.AdminProjectMembers.bjs
Pman.Tab.AdminProjectMembers.js
compiled/Admin.js
old/Pman.Tab.AdminPermMembers.bjs
old/Pman.Tab.AdminPermMembers.js
---

diff --git a/Pman.Dialog.AdminWatch.bjs b/Pman.Dialog.AdminWatch.bjs
index 916e350..0a8a13f 100644
--- a/Pman.Dialog.AdminWatch.bjs
+++ b/Pman.Dialog.AdminWatch.bjs
@@ -140,7 +140,7 @@
                                                     "xtype": "HttpProxy",
                                                     "method": "GET",
                                                     "|xns": "Roo.data",
-                                                    "|url": "baseURL + '/Roo/Person.php'"
+                                                    "|url": "baseURL + '/Roo/core_person'"
                                                 },
                                                 {
                                                     "*prop": "reader",
diff --git a/Pman.Dialog.AdminWatch.js b/Pman.Dialog.AdminWatch.js
index 5c3c116..f98c5c3 100644
--- a/Pman.Dialog.AdminWatch.js
+++ b/Pman.Dialog.AdminWatch.js
@@ -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',
diff --git a/Pman.Dialog.Groups.js b/Pman.Dialog.Groups.js
index 0702ce5..80c8d56 100644
--- a/Pman.Dialog.Groups.js
+++ b/Pman.Dialog.Groups.js
@@ -104,7 +104,7 @@ Pman.Dialog.Groups = {
                 store: new Ext.data.Store({
                       // load using HTTP
                     proxy: new Ext.data.HttpProxy({
-                        url: baseURL + '/Roo/Person.php',
+                        url: baseURL + '/Roo/core_person',
                         method: 'GET'
                     }),
                     reader: Pman.Readers.Person,
diff --git a/Pman.Tab.AdminContacts.bjs b/Pman.Tab.AdminContacts.bjs
index 93f34e0..a5f06ab 100644
--- a/Pman.Tab.AdminContacts.bjs
+++ b/Pman.Tab.AdminContacts.bjs
@@ -62,7 +62,7 @@
      "items" : [
       {
        "listeners" : {
-        "update" : "function (_self, record, operation)\n{\n    if (operation != 'commit') {\n        return;\n    }\n    // only used to change active status.\n    \n    new Pman.Request({\n        url : baseURL + '/Roo/Person.php',\n        method :'POST',\n        params : {\n            id : record.data.id,\n            active: record.data.active\n            \n        },\n        success : function() {\n            // do nothing\n            \n            _this.grid.ds.remove(record);\n            \n        },\n        failure : function() \n        {\n            Roo.MessageBox.alert(\"Error\", \"saving failed\", function() {\n                _this.grid.footer.onClick('first');\n            });\n        }\n    });\n}",
+        "update" : "function (_self, record, operation)\n{\n    if (operation != 'commit') {\n        return;\n    }\n    // only used to change active status.\n    \n    new Pman.Request({\n        url : baseURL + '/Roo/core_person',\n        method :'POST',\n        params : {\n            id : record.data.id,\n            active: record.data.active\n            \n        },\n        success : function() {\n            // do nothing\n            \n            _this.grid.ds.remove(record);\n            \n        },\n        failure : function() \n        {\n            Roo.MessageBox.alert(\"Error\", \"saving failed\", function() {\n                _this.grid.footer.onClick('first');\n            });\n        }\n    });\n}",
         "beforeload" : "function (_self, o)\n{\n    if(!_this.active_company_button.pressed){\n        o.params['!company_id_comptype'] = 'OWNER';\n    }\n    \n    o.params['query[search]'] = _this.searchBox.getValue();\n    \n    if (!_this.activeButton) {return; false;}\n    \n    if (_this.companyCombo &&   _this.companyCombo.getValue()) {\n        o.params.company_id =   _this.companyCombo.getValue();\n    }\n    \n    \n    o.params.active = _this.activeButton.pressed ? 0 : 1;\n    \n    if(_this.active_company_button.pressed){\n        o.params.company_id = 0;\n    }\n    \n    var c = Pman.Tab.AdminContactsManager.layout.getRegion('west').getActivePanel();\n    \n    if (!c) { \n        return false;\n    }\n    \n    var tms = c.grid.getSelectionModel().getSelected();\n    \n    if (!tms) {\n        return false;\n    }\n    \n    if(c.tableName == 'Groups'){\n        o.params['query[in_group]'] = tms.data.id;\n        o.params['query[type]'] = 2; // group type..\n    }else{\n        o.params['query[in_country]'] = (tms.data.country*1 == -1) ? '' : tms.data.country;\n        o.params['query[in_group]'] = 0;\n        o.params['query[type]'] = 2;\n    }\n    /*\n    if (Pman.Tab.AdminContactsGroup && Pman.Tab.AdminContactsGroup.grid) {\n        \n        \n        \n    }\n    \n    if(Pman.Tab.AdminCountries && Pman.Tab.AdminCountries.grid){\n        var tms = Pman.Tab.AdminCountries.grid.getSelectionModel().getSelected();\n        \n        if (!tms) {\n            return false;\n        }\n        \n    }\n    */\n    //o.params['query[name]'] = _this.searchBox.getValue();\n  \n}"
        },
        "xtype" : "Store",
@@ -72,7 +72,7 @@
        "* prop" : "dataSource",
        "items" : [
         {
-         "$ url" : "baseURL + '/Roo/Person.php'",
+         "$ url" : "baseURL + '/Roo/core_person'",
          "method" : "GET",
          "xtype" : "HttpProxy",
          "$ xns" : "Roo.data",
diff --git a/Pman.Tab.AdminContacts.js b/Pman.Tab.AdminContacts.js
index 235d884..f02789a 100644
--- a/Pman.Tab.AdminContacts.js
+++ b/Pman.Tab.AdminContacts.js
@@ -472,7 +472,7 @@ Pman.Tab.AdminContacts = new Roo.XComponent({
            // only used to change active status.
            
            new Pman.Request({
-               url : baseURL + '/Roo/Person.php',
+               url : baseURL + '/Roo/core_person',
                method :'POST',
                params : {
                    id : record.data.id,
@@ -499,7 +499,7 @@ Pman.Tab.AdminContacts = new Roo.XComponent({
      proxy : {
       xtype : 'HttpProxy',
       method : 'GET',
-      url : baseURL + '/Roo/Person.php',
+      url : baseURL + '/Roo/core_person',
       xns : Roo.data,
       '|xns' : 'Roo.data'
      },
diff --git a/Pman.Tab.AdminLogEvents.bjs b/Pman.Tab.AdminLogEvents.bjs
index 0a9ecd5..bedc0b1 100644
--- a/Pman.Tab.AdminLogEvents.bjs
+++ b/Pman.Tab.AdminLogEvents.bjs
@@ -246,7 +246,7 @@
                "* prop" : "store",
                "items" : [
                 {
-                 "$ url" : "baseURL + '/Roo/Person.php'",
+                 "$ url" : "baseURL + '/Roo/core_person'",
                  "method" : "GET",
                  "xtype" : "HttpProxy",
                  "$ xns" : "Roo.data",
diff --git a/Pman.Tab.AdminLogEvents.js b/Pman.Tab.AdminLogEvents.js
index e5bd36f..e42df2a 100644
--- a/Pman.Tab.AdminLogEvents.js
+++ b/Pman.Tab.AdminLogEvents.js
@@ -387,7 +387,7 @@ Pman.Tab.AdminLogEvents = new Roo.XComponent({
            proxy : {
             xtype : 'HttpProxy',
             method : 'GET',
-            url : baseURL + '/Roo/Person.php',
+            url : baseURL + '/Roo/core_person',
             xns : Roo.data,
             '|xns' : 'Roo.data'
            },
diff --git a/Pman.Tab.AdminProjectMembers.bjs b/Pman.Tab.AdminProjectMembers.bjs
index 0f2d906..046a9a5 100644
--- a/Pman.Tab.AdminProjectMembers.bjs
+++ b/Pman.Tab.AdminProjectMembers.bjs
@@ -55,7 +55,7 @@
        "* prop" : "dataSource",
        "items" : [
         {
-         "$ url" : "baseURL + '/Roo/Person.php'",
+         "$ url" : "baseURL + '/Roo/core_person'",
          "method" : "GET",
          "xtype" : "HttpProxy",
          "$ xns" : "Roo.data",
diff --git a/Pman.Tab.AdminProjectMembers.js b/Pman.Tab.AdminProjectMembers.js
index e0d2595..87d823f 100644
--- a/Pman.Tab.AdminProjectMembers.js
+++ b/Pman.Tab.AdminProjectMembers.js
@@ -203,7 +203,7 @@ Pman.Tab.AdminProjectMembers = new Roo.XComponent({
      },
      proxy : {
       method : 'GET',
-      url : baseURL + '/Roo/Person.php',
+      url : baseURL + '/Roo/core_person',
       xns : Roo.data,
       '|xns' : 'Roo.data',
       xtype : 'HttpProxy'
diff --git a/compiled/Admin.js b/compiled/Admin.js
index dccbb07..8f6cfb9 100644
--- a/compiled/Admin.js
+++ b/compiled/Admin.js
@@ -206,7 +206,7 @@ this.tab=C.add(B,new Ext.NestedLayoutPanel(this.layout,{title:_T["d4650cf6ae2be8
 Pman.Dialog.Groups={dialog:false,form:false,id:"Group",create:function(){if(this.dialog){return;}var A=this;this.dialog=new Ext.LayoutDialog(Ext.get(document.body).createChild({tag:"div"}),{autoCreated:true,title:"edit team",modal:true,width:650,height:150,shadow:true,minWidth:200,minHeight:150,closable:false,draggable:false,center:{autoScroll:false,titlebar:false,hideTabs:true,closeOnTab:true,alwaysShowTabs:false}});
 this.dialog.addKeyListener(27,this.dialog.hide,this.dialog);this.dialog.addButton(_T["40e22bcebd4c093a709a1d94aae7eddf"],this.dialog.hide,this.dialog);this.dialog.addButton(_T["dd6a53f3ec4097eff373be1a2981b9f6"],this.save,this);this.layout=this.dialog.getLayout();
 this.layout.beginUpdate();this.form=new Ext.form.Form({labelWidth:250,listeners:{actionfailed:function(f,B){A.dialog.el.unmask();Pman.standardActionFailed(f,B);},actioncomplete:function(f,B){A.dialog.el.unmask();if(B.type=="load"){A.data=B.result.data;return;
-}if(B.type=="submit"){A.dialog.hide();if(A.callback){A.callback.call(this,B.result.data);}return;}}}});this.form.addxtype.apply(this.form,[{name:"name",fieldLabel:_T["ef36841feea4b33d42303e3bb4f9ef6a"],value:"",allowBlank:false,qtip:_T["6f4ae3eb4445956d92c6467a6dbb65e2"],xtype:"TextField",width:300},{xtype:"ComboBox",fieldLabel:_T["03c47106e6347d6be442e141baeb198e"],name:"leader_name",selectOnFocus:true,qtip:_T["0cbfa2f00e443885deb6af46c307b514"],allowBlank:true,width:280,store:new Ext.data.Store({proxy:new Ext.data.HttpProxy({url:baseURL+"/Roo/Person.php",method:"GET"}),reader:Pman.Readers.Person,listeners:{beforeload:function(st,o){o.params.company_id=Pman.Login.authUser.company_id*1;
+}if(B.type=="submit"){A.dialog.hide();if(A.callback){A.callback.call(this,B.result.data);}return;}}}});this.form.addxtype.apply(this.form,[{name:"name",fieldLabel:_T["ef36841feea4b33d42303e3bb4f9ef6a"],value:"",allowBlank:false,qtip:_T["6f4ae3eb4445956d92c6467a6dbb65e2"],xtype:"TextField",width:300},{xtype:"ComboBox",fieldLabel:_T["03c47106e6347d6be442e141baeb198e"],name:"leader_name",selectOnFocus:true,qtip:_T["0cbfa2f00e443885deb6af46c307b514"],allowBlank:true,width:280,store:new Ext.data.Store({proxy:new Ext.data.HttpProxy({url:baseURL+"/Roo/core_person",method:"GET"}),reader:Pman.Readers.Person,listeners:{beforeload:function(st,o){o.params.company_id=Pman.Login.authUser.company_id*1;
 }}}),displayField:"name",valueField:"id",hiddenName:"leader",typeAhead:true,forceSelection:true,doForce:function(){if(this.el.dom.value.length>0){this.el.dom.value=this.lastSelectionText===undefined?_T["3430b90edd3644ec8b40cf74e39b5a58"]:this.lastSelectionText;
 this.applyEmptyText();if(!this.el.dom.value.length){this.setFromData({id:0,name:"----"});}}},triggerAction:"all",tpl:new Ext.Template("<div class=\"x-grid-cell-text x-btn button\">","<b>{name}</b> {role}","</div>"),queryParam:"query[name]",loadingText:_T["425f2679b8159c6c2befedf611498097"],listWidth:300,minChars:2,pageSize:20},{name:"id",value:"",xtype:"Hidden"},{name:"type",value:"",xtype:"Hidden"}]);
 var ef=this.dialog.getLayout().getEl().createChild({tag:"div"});ef.dom.style.margin=10;this.form.render(ef.dom);var vp=this.dialog.getLayout().add("center",new Ext.ContentPanel(ef,{autoCreate:true,width:250,maxWidth:250,fitToFrame:true}));this.layout.endUpdate();
@@ -295,7 +295,7 @@ Pman.on("beforeload",function(){Pman.register({modKey:"000-pman_tab_adminlogeven
 }o.params=o.params||{};o.params.person_id=A.personSel.getValue();}},remoteSort:true,sortInfo:{field:"event_when",direction:"DESC"},proxy:{xtype:"HttpProxy",method:"GET",url:baseURL+"/Roo/Events.php"}},colModel:[{header:"When",width:100,dataIndex:"event_when",renderer:function(v){return v?v.dateFormat("d/m/Y H:i"):"";
 }},{header:"Staff",width:150,dataIndex:"person_name",renderer:function(v){return String.format("{0}",v);}},{header:"Action",width:100,dataIndex:"action",renderer:function(v){return String.format("{0}",v);}},{header:"IP",width:100,dataIndex:"ipaddr",renderer:function(v){return String.format("{0}",v);
 }},{header:"Affected",width:100,dataIndex:"on_id",renderer:function(v,x,r){return v?String.format("{0}({1})",r.data.on_table,v):"";}},{header:"Remarks",width:300,dataIndex:"remarks",renderer:function(v){return String.format("{0}",v);}}],footer:{xtype:"PagingToolbar",pageSize:25,displayInfo:true,displayMsg:_T["2ff0fe02cb998d6c2953ae2d68ca6ea4"],emptyMsg:_T["9a0575c139cbae13541dff297791a7d8"]},toolbar:{xtype:"Toolbar",items:[{xtype:"TextItem",xns:Roo.Toolbar,text:_T["b6ae8269eb074050cf22d7199051a157"]},{fieldLabel:_T["a9dbe313b1e0082050bda7ce5fc93f7e"],name:"person_id_name",qtip:_T["b827dddadd3ebfc23104551ee6a3a6f9"],emptyText:_T["b827dddadd3ebfc23104551ee6a3a6f9"],xtype:"ComboBox",selectOnFocus:true,allowBlank:true,width:150,listWidth:400,editable:false,displayField:"name",valueField:"id",typeAhead:true,forceSelection:true,triggerAction:"all",tpl:"<div class=\"x-grid-cell-text x-btn button\"><b>{name}</b> </div>",queryParam:"query[name]",loadingText:_T["d2489c8b4febecb80a1c387c1431696c"],minChars:2,pageSize:20,listeners:{select:function(D,F,E){A.grid.footer.onClick("first");
-},render:function(D){A.personSel=D;}},store:{xtype:"Store",reader:Pman.Readers.Person,listeners:{beforeload:function(D,o){o.params=o.params||{};o.company_id=Pman.Login.authUser.company_id;}},proxy:{xtype:"HttpProxy",url:baseURL+"/Roo/Person.php",method:"GET"}}}]}},region:"center"});
+},render:function(D){A.personSel=D;}},store:{xtype:"Store",reader:Pman.Readers.Person,listeners:{beforeload:function(D,o){o.params=o.params||{};o.company_id=Pman.Login.authUser.company_id;}},proxy:{xtype:"HttpProxy",url:baseURL+"/Roo/core_person",method:"GET"}}}]}},region:"center"});
 }};
 Pman.on("beforeload",function(){Pman.Dialog.PersonBulkAdd=new Pman.Dialog.PersonEditor({type:"new",dialogConfig:{title:_T["001969a043caf8ee9c27978405c14cf2"],height:350},itemList:["company_id_name","office_id_name","bulklist","id","active"]});});
 Pman.on("beforeload",function(){var A=false;if(A){return;}Pman.register({modKey:"999-pman_tab_admintranslations",module:Pman.Tab.AdminTranslations,region:"center",parent:Pman.Tab.Admin,name:_T["13e4f84d09a2d4057fdee709efdcca61"]});});Pman.Tab.AdminTranslations=new Roo.util.Observable({panel:false,disabled:false,parentLayout:false,add:function(C,B){var A=this;
diff --git a/old/Pman.Tab.AdminPermMembers.bjs b/old/Pman.Tab.AdminPermMembers.bjs
index 7d0d8eb..dcba1e3 100644
--- a/old/Pman.Tab.AdminPermMembers.bjs
+++ b/old/Pman.Tab.AdminPermMembers.bjs
@@ -36,7 +36,7 @@
      "items" : [
       {
        "listeners" : {
-        "update" : "function (_self, record, operation)\n{\n    if (operation != 'commit') {\n        return;\n    }\n    // only used to change active status.\n    \n    new Pman.Request({\n        url : baseURL + '/Roo/Person.php',\n        method :'POST',\n        params : {\n            id : record.data.id,\n            active: record.data.active\n            \n        },\n        success : function() {\n            // do nothing\n            \n            _this.grid.ds.remove(record);\n            \n        },\n        failure : function() \n        {\n            Roo.MessageBox.alert(\"Error\", \"saving failed\", function() {\n                _this.grid.footer.onClick('first');\n            });\n        }\n    });\n}",
+        "update" : "function (_self, record, operation)\n{\n    if (operation != 'commit') {\n        return;\n    }\n    // only used to change active status.\n    \n    new Pman.Request({\n        url : baseURL + '/Roo/core_person',\n        method :'POST',\n        params : {\n            id : record.data.id,\n            active: record.data.active\n            \n        },\n        success : function() {\n            // do nothing\n            \n            _this.grid.ds.remove(record);\n            \n        },\n        failure : function() \n        {\n            Roo.MessageBox.alert(\"Error\", \"saving failed\", function() {\n                _this.grid.footer.onClick('first');\n            });\n        }\n    });\n}",
         "beforeload" : "function (_self, o)\n{\n  \n   // technically we may allow non-owner's to be in the group..\n   // need to work out how that will work...\n   // \n   \n    //o.params['company_id_comptype'] = 'OWNER';\n    o.params['query[search]'] = _this.searchBox.getValue();\n    \n    if (!_this.activeButton) {return; false;}\n    \n    \n    o.params.active = _this.activeButton.pressed ? 0 : 1;\n    if (!Pman.Tab.AdminPermManager) { \n        return false;\n    }\n    \n    \n    if (Pman.Tab.AdminPermManager && Pman.Tab.AdminPermManager.grid) {\n        var tms = Pman.Tab.AdminPermManager.grid.getSelectionModel().getSelected();\n        \n        if (!tms) {\n            return false;\n        }\n        o.params['query[in_group]'] = tms.data.id;\n        o.params['query[type]'] = 0; // group type..\n        \n    }\n    //o.params['query[name]'] = _this.searchBox.getValue();\n  \n    \n}"
        },
        "xtype" : "Store",
@@ -46,7 +46,7 @@
        "* prop" : "dataSource",
        "items" : [
         {
-         "$ url" : "baseURL + '/Roo/Person.php'",
+         "$ url" : "baseURL + '/Roo/core_person'",
          "xtype" : "HttpProxy",
          "method" : "GET",
          "$ xns" : "Roo.data",
diff --git a/old/Pman.Tab.AdminPermMembers.js b/old/Pman.Tab.AdminPermMembers.js
index 51a2e54..07e4b7f 100644
--- a/old/Pman.Tab.AdminPermMembers.js
+++ b/old/Pman.Tab.AdminPermMembers.js
@@ -21,7 +21,7 @@ Pman.Tab.AdminPermMembers = new Roo.XComponent({
     dataSource : {
      proxy : {
       '|xns' : 'Roo.data',
-      url : baseURL + '/Roo/Person.php',
+      url : baseURL + '/Roo/core_person',
       xtype : 'HttpProxy',
       method : 'GET',
       xns : Roo.data
@@ -354,7 +354,7 @@ Pman.Tab.AdminPermMembers = new Roo.XComponent({
            // only used to change active status.
            
            new Pman.Request({
-               url : baseURL + '/Roo/Person.php',
+               url : baseURL + '/Roo/core_person',
                method :'POST',
                params : {
                    id : record.data.id,