allow access to nest.

diff --git a/Pman.Tab.AdminEmailTemplates.bjs b/Pman.Tab.AdminEmailTemplates.bjs
index d18c986..0be3b8f 100644 (file)
--- a/Pman.Tab.AdminEmailTemplates.bjs
+++ b/Pman.Tab.AdminEmailTemplates.bjs
@@ -2,7 +2,7 @@
  "name" : "Pman.Tab.AdminEmailTemplates",
  "parent" : "Pman.Tab.Admin",
  "title" : "Manage Email Templates",
- "path" : "/home/johns/gitlive/Pman.Admin/Pman.Tab.AdminEmailTemplates.bjs",
+ "path" : "/home/alan/gitlive/Pman.Admin/Pman.Tab.AdminEmailTemplates.bjs",
  "permname" : "",
  "modOrder" : "999",
  "strings" : {
@@ -23,9 +23,12 @@
  },
  "items" : [
   {
+   "listeners" : {
+    "render" : "function (_self)\n{\n    _this.nest = this;\n}"
+   },
    "region" : "center",
-   "xtype" : "NestedLayoutPanel",
    "title" : "Email Template",
+   "xtype" : "NestedLayoutPanel",
    "$ xns" : "Roo",
    "items" : [
     {
@@ -53,9 +56,9 @@
        "listeners" : {
         "|activate" : "function() {\n    _this.panel = this;\n    if (_this.grid) {\n        _this.grid.footer.onClick('first');\n    }\n}"
        },
+       "region" : "center",
        "fitToframe" : true,
        "background" : true,
-       "region" : "center",
        "title" : "core_email",
        "xtype" : "GridPanel",
        "fitContainer" : true,
@@ -92,8 +95,8 @@
            "items" : [
             {
              "$ url" : "baseURL + '/Roo/Core_email.php'",
-             "xtype" : "HttpProxy",
              "method" : "GET",
+             "xtype" : "HttpProxy",
              "$ xns" : "Roo.data",
              "* prop" : "proxy"
             },
@@ -200,8 +203,8 @@
           },
           {
            "xtype" : "ColumnModel",
-           "width" : 250,
            "header" : "Name",
+           "width" : 250,
            "$ renderer" : "function(v,x,r) \n{ \n    if(r.data.active * 1 < 1){\n        return String.format('<s>{0}</s>', v ? v : ''); \n    }\n    \n    return String.format('{0}', v ? v : ''); \n}",
            "$ xns" : "Roo.grid",
            "Boolean sortable" : true,
@@ -210,8 +213,8 @@
           },
           {
            "xtype" : "ColumnModel",
-           "width" : 300,
            "header" : "Title",
+           "width" : 300,
            "$ renderer" : "function(v,x,r) \n{ \n    if(r.data.active * 1 < 1){\n        return String.format('<s>{0}</s>', v ? v : ''); \n    }\n    \n    return String.format('{0}', v ? v : ''); \n}",
            "$ xns" : "Roo.grid",
            "Boolean sortable" : true,
@@ -220,8 +223,8 @@
           },
           {
            "xtype" : "ColumnModel",
-           "width" : 300,
            "header" : "From Name",
+           "width" : 300,
            "$ renderer" : "function(v) { return String.format('{0}', v ? v : ''); }",
            "$ xns" : "Roo.grid",
            "Boolean sortable" : true,
@@ -230,8 +233,8 @@
           },
           {
            "xtype" : "ColumnModel",
-           "header" : "From Email",
            "width" : 300,
+           "header" : "From Email",
            "$ renderer" : "function(v) { return String.format('{0}', v ? v : ''); }",
            "$ xns" : "Roo.grid",
            "Boolean sortable" : true,
@@ -240,8 +243,8 @@
           },
           {
            "xtype" : "ColumnModel",
-           "width" : 300,
            "header" : "BCC Group",
+           "width" : 300,
            "$ renderer" : "function(v) { return String.format('{0}', v ? v : ''); }",
            "$ xns" : "Roo.grid",
            "Boolean sortable" : true,
@@ -257,8 +260,8 @@
         "render" : "function (_self)\n{\n    _this.viewPanel = _self;\n}"
        },
        "autoScroll" : true,
-       "background" : false,
        "fitToFrame" : true,
+       "background" : false,
        "region" : "south",
        "title" : "View Message",
        "xtype" : "ContentPanel",
@@ -285,8 +288,8 @@
            "items" : [
             {
              "$ url" : "baseURL+'/Roo/Core_email.php'",
-             "xtype" : "HttpProxy",
              "method" : "GET",
+             "xtype" : "HttpProxy",
              "$ xns" : "Roo.data",
              "* prop" : "proxy"
             },

diff --git a/Pman.Tab.AdminEmailTemplates.js b/Pman.Tab.AdminEmailTemplates.js
index 9617ee5..335de41 100644 (file)
--- a/Pman.Tab.AdminEmailTemplates.js
+++ b/Pman.Tab.AdminEmailTemplates.js
@@ -38,6 +38,12 @@ Pman.Tab.AdminEmailTemplates = new Roo.XComponent({
    xtype : 'NestedLayoutPanel',
    region : 'center',
    title : _this._strings['f49559cda3fb906fbd7736f8b8a0e37d'] /* Email Template */,
+   listeners : {
+    render : function (_self)
+     {
+         _this.nest = this;
+     }
+   },
    xns : Roo,
    '|xns' : 'Roo',
    layout : {

diff --git a/Pman.Tab.AdminLogEvents.bjs b/Pman.Tab.AdminLogEvents.bjs
index b6922c9..f783794 100644 (file)
--- a/Pman.Tab.AdminLogEvents.bjs
+++ b/Pman.Tab.AdminLogEvents.bjs
@@ -2,7 +2,7 @@
  "name" : "Pman.Tab.AdminLogEvents",
  "parent" : "Pman.Tab.AdminLogs",
  "title" : "Admin - Logs - Events",
- "path" : "/home/benny/gitlive/web.hhyc_membership_system/Pman/Admin/Pman.Tab.AdminLogEvents.bjs",
+ "path" : "/home/alan/gitlive/Pman.Admin/Pman.Tab.AdminLogEvents.bjs",
  "permname" : "Admin.Logs",
  "modOrder" : "001",
  "strings" : {
@@ -27,11 +27,26 @@
   "90e4ac2e5a22e53df63b6b186d8727ba" : "No Events found",
   "2c92a9a6a5dbf570825e62eabcdecd8d" : "Affected"
  },
+ "named_strings" : {
+  "person_table_loadingText" : "1243daf593fa297e07ab03bf06d925af",
+  "person_id_name_qtip" : "340c2ee497b85d5954b01c64de7f44f6",
+  "person_table_qtip" : "037fd50b0e85bb65995ca7125d06c7cd",
+  "person_table_emptyText" : "037fd50b0e85bb65995ca7125d06c7cd",
+  "person_id_name_emptyText" : "340c2ee497b85d5954b01c64de7f44f6",
+  "person_id_name_fieldLabel" : "40bed7cf9b3d4bb3a3d7a7e3eb18c5eb",
+  "on_table_qtip" : "a8929eb5c1553d3f70497f862d25d0ce",
+  "on_table_emptyText" : "679308a758de538c5f39c4c6cdba6593",
+  "action_emptyText" : "a8929eb5c1553d3f70497f862d25d0ce",
+  "action_loadingText" : "1243daf593fa297e07ab03bf06d925af",
+  "action_qtip" : "a8929eb5c1553d3f70497f862d25d0ce",
+  "on_table_loadingText" : "1243daf593fa297e07ab03bf06d925af",
+  "person_id_name_loadingText" : "1243daf593fa297e07ab03bf06d925af"
+ },
  "items" : [
   {
    "region" : "center",
-   "xtype" : "NestedLayoutPanel",
    "title" : "Events",
+   "xtype" : "NestedLayoutPanel",
    "$ xns" : "Roo",
    "items" : [
     {
@@ -65,9 +80,9 @@
        "listeners" : {
         "|activate" : "function() {\n    _this.panel = this;\n    if (_this.grid) {\n        _this.grid.footer.onClick('first');\n    }\n}"
        },
+       "background" : false,
        "region" : "center",
        "fitToframe" : true,
-       "background" : false,
        "title" : "Events",
        "xtype" : "GridPanel",
        "fitContainer" : true,
@@ -114,8 +129,8 @@
             },
             {
              "$ url" : "baseURL + '/Roo/Events.php'",
-             "method" : "GET",
              "xtype" : "HttpProxy",
+             "method" : "GET",
              "$ xns" : "Roo.data",
              "* prop" : "proxy"
             }
@@ -247,8 +262,8 @@
                "items" : [
                 {
                  "$ url" : "baseURL + '/Roo/core_person'",
-                 "xtype" : "HttpProxy",
                  "method" : "GET",
+                 "xtype" : "HttpProxy",
                  "$ xns" : "Roo.data",
                  "* prop" : "proxy"
                 },
@@ -303,8 +318,8 @@
                "items" : [
                 {
                  "$ url" : "baseURL + '/Roo/Events.php'",
-                 "xtype" : "HttpProxy",
                  "method" : "GET",
+                 "xtype" : "HttpProxy",
                  "$ xns" : "Roo.data",
                  "* prop" : "proxy"
                 },
@@ -359,8 +374,8 @@
                "items" : [
                 {
                  "$ url" : "baseURL + '/Roo/Events.php'",
-                 "xtype" : "HttpProxy",
                  "method" : "GET",
+                 "xtype" : "HttpProxy",
                  "$ xns" : "Roo.data",
                  "* prop" : "proxy"
                 },
@@ -404,8 +419,8 @@
           },
           {
            "xtype" : "ColumnModel",
-           "header" : "When",
            "width" : 100,
+           "header" : "When",
            "$ renderer" : "function(v) { return v ? v.dateFormat('d/m/Y H:i') : ''; }",
            "$ xns" : "Roo.grid",
            "* prop" : "colModel[]",
@@ -413,8 +428,8 @@
           },
           {
            "xtype" : "ColumnModel",
-           "header" : "#id",
            "width" : 100,
+           "header" : "#id",
            "$ xns" : "Roo.grid",
            "$ Boolean hidden" : "(function() {\n    return typeof(Pman.Tab.AdminLogEvents.hide_cols) == 'undefined' ? \n    false : \n    ((Pman.Tab.AdminLogEvents.hide_cols.indexOf('id') > -1) ? true : false);\n})()",
            "* prop" : "colModel[]",
@@ -422,8 +437,8 @@
           },
           {
            "xtype" : "ColumnModel",
-           "header" : "Person",
            "width" : 150,
+           "header" : "Person",
            "$ renderer" : "function(v,x,r) { \n    \n    var ptable = _this.tableSel.getValue();\n    \n    var efield = 'person_id_email';\n    var nfield = 'person_id_name';    \n    \n    if(\n        ptable.length &&\n        ptable != 'Person' &&\n        typeof(r.data[ptable + '_id_email']) != 'undefined' &&\n        typeof(r.data[ptable + '_id_name']) != 'undefined'\n    ){\n        efield = ptable + '_id_email';\n        nfield = ptable + '_id_name';    \n    }\n    \n    var email = r.data[efield]; // ? r.data.person_id_email : r.data.person_id_email;\n    var name  = r.data[nfield]; // ? r.data.person_id_name : r.data.person_id_name;    \n    return String.format('{0} &lt;<a href=\"mailto:{1}\">{1}</a>&gt;', \n        name, email); \n\n\n}",
            "$ xns" : "Roo.grid",
            "* prop" : "colModel[]",
@@ -431,8 +446,8 @@
           },
           {
            "xtype" : "ColumnModel",
-           "width" : 100,
            "header" : "Action",
+           "width" : 100,
            "$ renderer" : "function(v) { return String.format('{0}', v); }",
            "$ xns" : "Roo.grid",
            "* prop" : "colModel[]",
@@ -440,8 +455,8 @@
           },
           {
            "xtype" : "ColumnModel",
-           "width" : 100,
            "header" : "IP",
+           "width" : 100,
            "$ renderer" : "function(v) { return String.format('{0}', v); }",
            "$ xns" : "Roo.grid",
            "* prop" : "colModel[]",
@@ -449,8 +464,8 @@
           },
           {
            "xtype" : "ColumnModel",
-           "header" : "Affected",
            "width" : 100,
+           "header" : "Affected",
            "$ renderer" : "function(v, x, r) {                     \n            return v ? String.format('{0}({1})', v,  r.data.on_id)  : '';  \n   }",
            "$ xns" : "Roo.grid",
            "$ Boolean hidden" : "(function() {\n    return typeof(Pman.Tab.AdminLogEvents.hide_cols) == 'undefined' ? \n    false : \n    ((Pman.Tab.AdminLogEvents.hide_cols.indexOf('on_table') > -1) ? true : false);\n})()",
@@ -459,8 +474,8 @@
           },
           {
            "xtype" : "ColumnModel",
-           "header" : "Remarks",
            "width" : 300,
+           "header" : "Remarks",
            "$ renderer" : "function(v) { return String.format('<span qtip=\"{1}\">{0}</span>', v, Roo.util.Format.htmlEncode(v)); }",
            "$ xns" : "Roo.grid",
            "* prop" : "colModel[]",