Pman.Tab.AdminLogEvents.bjs

Pman.Tab.AdminLogEvents.js

diff --git a/Pman.Tab.AdminLogEvents.bjs b/Pman.Tab.AdminLogEvents.bjs
index 38f228e..05e66d2 100644 (file)
--- a/Pman.Tab.AdminLogEvents.bjs
+++ b/Pman.Tab.AdminLogEvents.bjs
@@ -1,9 +1,9 @@
 {
-    "id": "roo-file-104",
+    "id": "roo-file-148",
     "name": "Pman.Tab.AdminLogEvents",
     "parent": "Pman.Tab.AdminLogs",
     "title": "Admin - Logs - Events",
-    "path": "/home/chris/gitlive/Pman.Admin/Pman.Tab.AdminLogEvents.bjs",
+    "path": "/home/alan/gitlive/Pman.Admin/Pman.Tab.AdminLogEvents.bjs",
     "items": [
         {
             "region": "center",
@@ -346,7 +346,7 @@
                                             "header": "Staff",
                                             "width": 150,
                                             "xtype": "ColumnModel",
-                                            "|renderer": "function(v,x,r) { \n    return String.format('{0} &lt;<a href=\"mailto:{1}\">{1}</a>&gt;', \n        v, r.data.person_table_email); \n}",
+                                            "|renderer": "function(v,x,r) { \n    \n    var email = r.data.person_table_email ? r.data.person_table_email : r.data.person_id_email;\n    var name  = r.data.person_table_name ? r.data.person_table_name : r.data.person_id_name;    \n    return String.format('{0} &lt;<a href=\"mailto:{1}\">{1}</a>&gt;', \n        name, email); \n}",
                                             "|xns": "Roo.grid"
                                         },
                                         {

diff --git a/Pman.Tab.AdminLogEvents.js b/Pman.Tab.AdminLogEvents.js
index ec4d4ac..a9cb048 100644 (file)
--- a/Pman.Tab.AdminLogEvents.js
+++ b/Pman.Tab.AdminLogEvents.js
@@ -1131,8 +1131,11 @@ Pman.Tab.AdminLogEvents = new Roo.XComponent({
                                     header : 'Staff',
                                     width : 150,
                                     renderer : function(v,x,r) { 
+                                        
+                                        var email = r.data.person_table_email ? r.data.person_table_email : r.data.person_id_email;
+                                        var name  = r.data.person_table_name ? r.data.person_table_name : r.data.person_id_name;    
                                         return String.format('{0} &lt;<a href="mailto:{1}">{1}</a>&gt;', 
-                                            v, r.data.person_table_email); 
+                                            name, email); 
                                     }
                                 },
                                 {