Pman.Tab.BAdminEmailTemplates.bjs

Pman.Tab.BAdminEmailTemplates.js

diff --git a/Pman.Tab.BAdminEmailTemplates.bjs b/Pman.Tab.BAdminEmailTemplates.bjs
index d1c2b20..2bb86ed 100644 (file)
--- a/Pman.Tab.BAdminEmailTemplates.bjs
+++ b/Pman.Tab.BAdminEmailTemplates.bjs
@@ -300,7 +300,7 @@
            "xtype" : "ColumnModel",
            "Number xs" : 3,
            "header" : "To / BCC Group",
-           "$ renderer" : "function(v,x,r)\n{ \n    // if to group id < 0 then it's disabled...\n    \n    var nid = r.data.to_group_id * 1 < 1;\n    var n = nid ? r.data.group_member_count * 1 : 0;\n    var grp_str = String.format('<small>To: {0} ' + \n            '<span class=\"badge' + (n > 0 ?  '' : ' badge-danger') + '\">{1}</span></small><br>',\n            r.data.to_group_name,\n            nid < 1 ? 'Not set' : n\n        );\n   \n    if (nid < 0) { // no To needed..\n        grp_str = '';\n    }\n    n = r.data.bcc_group_id * 1 < 1 ? r.data.bcc_group_member_count * 1 : r.data.bcc_group_id * 1 ;\n\n    var bcc_str = String.format('<small>BCC: {0} <span class=\"badge' + (n > 0 ?  '' : ' badge-danger') + '\">{1}</span></small>',\n            r.data.bcc_group_name,\n            r.data.bcc_group_id * 1 < 1 ? 'Not set' : n\n        );\n        \n    if (n < 0) { // no To needed..\n        bcc_str = '';\n    }  \n   \n    return grp_str + bcc_str;\n}",
+           "$ renderer" : "function(v,x,r)\n{ \n    // if to group id < 0 then it's disabled...\n    \n    var nid = r.data.to_group_id * 1 < 1;\n    var n = nid ? r.data.group_member_count * 1 : 0;\n    var grp_str = String.format('<small>To: {0} ' + \n            '<span class=\"badge' + (n > 0 ?  '' : ' badge-danger') + '\">{1}</span></small><br>',\n            r.data.to_group_name,\n            nid < 1 ? 'Not set' : n\n        );\n   \n    if (nid < 0) { // no To needed..\n        grp_str = '';\n    }\n    nid = r.data.bcc_group_id * 1\n    n = nid < 1 ? r.data.bcc_group_member_count * 1 : 0;\n\n    var bcc_str = String.format('<small>BCC: {0} <span class=\"badge' + (n > 0 ?  '' : ' badge-danger') + '\">{1}</span></small>',\n            r.data.bcc_group_name,\n            r.data.bcc_group_id * 1 < 1 ? 'Not set' : n\n        );\n        \n    if (n < 0) { // no To needed..\n        bcc_str = '';\n    }  \n   \n    return grp_str + bcc_str;\n}",
            "$ xns" : "Roo.grid",
            "* prop" : "cm[]",
            "dataIndex" : "to_group_name"

diff --git a/Pman.Tab.BAdminEmailTemplates.js b/Pman.Tab.BAdminEmailTemplates.js
index 119187a..5eb573c 100644 (file)
--- a/Pman.Tab.BAdminEmailTemplates.js
+++ b/Pman.Tab.BAdminEmailTemplates.js
@@ -543,7 +543,8 @@ Pman.Tab.BAdminEmailTemplates = new Roo.XComponent({
              if (nid < 0) { // no To needed..
                  grp_str = '';
              }
-             n = r.data.bcc_group_id * 1 < 1 ? r.data.bcc_group_member_count * 1 : r.data.bcc_group_id * 1 ;
+             nid = r.data.bcc_group_id * 1
+             n = nid < 1 ? r.data.bcc_group_member_count * 1 : 0;
          
              var bcc_str = String.format('<small>BCC: {0} <span class="badge' + (n > 0 ?  '' : ' badge-danger') + '">{1}</span></small>',
                      r.data.bcc_group_name,