Pman.Tab.MTrackTicket.bjs

Pman.Tab.MTrackTicket.js

diff --git a/Pman.Tab.MTrackTicket.bjs b/Pman.Tab.MTrackTicket.bjs
index 565ed6a..f479199 100644 (file)
--- a/Pman.Tab.MTrackTicket.bjs
+++ b/Pman.Tab.MTrackTicket.bjs
@@ -457,7 +457,7 @@
            "xtype" : "ColumnModel",
            "width" : 200,
            "header" : "Summary",
-           "$ renderer" : "function(v,x,r) { \n    \n    var col = '#000'; // closed?\n    switch (r.data.status_name) {\n        case 'REVIEW_BY_ADMIN':\n            col = '#0cc'; break; // blue\n        case 'TODO':\n        case 'CLIENT_NEW_REQUEST':        \n        case 'CLIENT_SAY_NEED_MORE_WORK':                \n            col = '#c00'; break; // redish\n        case 'CLOSED':                \n            col = '#999'; break; // grey\n   }\n   \n   var sn = r.data.status_name.toLowerCase().split('_').join(' ');\n   \n    return String.format(\n        r.data.status_name == 'CLOSED'  ?\n              '{2}</span><s style=\"color:{3}\">[{1}]</s> {0}':\n              '{2}<span style=\"color:{3}\">[{1}]</span> {0}',\n            v,\n            r.data.status_name == 'CLOSED'  ?\n                 r.data.resolution_id_name : \n                 r.data.status_name ,\n            r.json.jira_ref ?  (r.json.jira_ref+ ' ')  : '',\n            col\n            ); \n}\n",
+           "$ renderer" : "function(v,x,r) { \n    \n    var col = '#000'; // closed?\n    switch (r.data.status_name) {\n        case 'REVIEW_BY_ADMIN':\n            col = '#0cc'; break; // blue\n        case 'TODO':\n        case 'CLIENT_NEW_REQUEST':        \n        case 'CLIENT_SAY_NEED_MORE_WORK':                \n            col = '#c00'; break; // redish\n        case 'CLOSED':                \n            col = '#999'; break; // grey\n   }\n   \n   var sn = r.data.status_name.toLowerCase().split('_').join(' ');\n   \n    return String.format(\n        r.data.status_name == 'CLOSED'  ?\n              '</span><s style=\"color:{2}\">[{1}]</s> {0}':\n              '<span style=\"color:{2}\">[{1}]</span> {0}',\n            v,\n            r.data.status_name == 'CLOSED'  ?\n                 r.data.resolution_id_name : \n                 r.data.status_name , col\n            ); \n}\n",
            "$ xns" : "Roo.grid",
            "* prop" : "colModel[]",
            "dataIndex" : "summary"

diff --git a/Pman.Tab.MTrackTicket.js b/Pman.Tab.MTrackTicket.js
index f48ca24..32268b0 100644 (file)
--- a/Pman.Tab.MTrackTicket.js
+++ b/Pman.Tab.MTrackTicket.js
@@ -1628,14 +1628,12 @@ Pman.Tab.MTrackTicket = new Roo.XComponent({
             
              return String.format(
                  r.data.status_name == 'CLOSED'  ?
-                       '{2}</span><s style="color:{3}">[{1}]</s> {0}':
-                       '{2}<span style="color:{3}">[{1}]</span> {0}',
+                       '</span><s style="color:{2}">[{1}]</s> {0}':
+                       '<span style="color:{2}">[{1}]</span> {0}',
                      v,
                      r.data.status_name == 'CLOSED'  ?
                           r.data.resolution_id_name : 
-                          r.data.status_name ,
-                     r.json.jira_ref ?  (r.json.jira_ref+ ' ')  : '',
-                     col
+                          r.data.status_name , col
                      ); 
          },
          width : 200,