From 8bbfb0a551bb3a796f010209b60684f0dda8bdec Mon Sep 17 00:00:00 2001 From: Raju Chaudhary Date: Fri, 13 Oct 2017 14:06:18 +0545 Subject: [PATCH 1/2] [#1046] Disable sending mail to non nation members --- app/MyApp/app/views/CourseMembers.js | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/app/MyApp/app/views/CourseMembers.js b/app/MyApp/app/views/CourseMembers.js index 05357e368..92f408673 100644 --- a/app/MyApp/app/views/CourseMembers.js +++ b/app/MyApp/app/views/CourseMembers.js @@ -43,7 +43,6 @@ $(function () { memberProgress.fetch({ async: false, success: function(res){ - console.log(res) member_list = [] if(res.length > 0){ for(var i = 0; i < res.length; i++){ @@ -57,7 +56,6 @@ $(function () { config.fetch({ async: false }) - var currentConfig = config.first().toJSON() var code = currentConfig.rows[0].doc.code var na = currentConfig.rows[0].doc.nationName.substring(3,5); @@ -84,7 +82,14 @@ $(function () { attchmentURL = attchmentURL + _.keys(mems.get('_attachments'))[0] src = attchmentURL } - viewtext += '' + mems.get('firstName') + ' ' + mems.get('lastName') + ''+roleOfMem+''+App.languageDict.attributes.Send_Email+'' + if(config.models[0].attributes.rows[0].doc.code == 'nationbell' && mems.get("community") == 'nationbell'){ + viewtext += '' + mems.get('firstName') + ' ' + mems.get('lastName') + ''+roleOfMem+''+App.languageDict.attributes.Send_Email+'' + } + else if (config.models[0].attributes.rows[0].doc.type == 'community'){ + viewtext += '' + mems.get('firstName') + ' ' + mems.get('lastName') + ''+roleOfMem+''+App.languageDict.attributes.Send_Email+'' + } + else + viewtext += '' + mems.get('firstName') + ' ' + mems.get('lastName') + ''+roleOfMem+'' var loggedIn = new App.Models.Member({ "_id": $.cookie('Member._id') }) @@ -181,7 +186,10 @@ $(function () { attchmentURL = attchmentURL + _.keys(mems.get('_attachments'))[0] src = attchmentURL } - viewtext += '' + mems.get('firstName') + ' ' + mems.get('lastName') + ''+roleOfMem+''+App.languageDict.attributes.Send_Email+'' + if(config.models[0].attributes.rows[0].doc.code == 'nationbell' && mems.get("community") == 'nationbell') + viewtext += '' + mems.get('firstName') + ' ' + mems.get('lastName') + ''+roleOfMem+''+App.languageDict.attributes.Send_Email+'' + else + viewtext += '' + mems.get('firstName') + ' ' + mems.get('lastName') + ''+roleOfMem+'' var loggedIn = new App.Models.Member({ "_id": $.cookie('Member._id') }) From a59f3fa128acbe4f3f1995b46e23490aa981e028 Mon Sep 17 00:00:00 2001 From: Raju Chaudhary Date: Mon, 23 Oct 2017 11:51:12 +0545 Subject: [PATCH 2/2] [1046] wrap up conditions --- app/MyApp/app/views/CourseMembers.js | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/app/MyApp/app/views/CourseMembers.js b/app/MyApp/app/views/CourseMembers.js index 92f408673..d21b15073 100644 --- a/app/MyApp/app/views/CourseMembers.js +++ b/app/MyApp/app/views/CourseMembers.js @@ -82,14 +82,11 @@ $(function () { attchmentURL = attchmentURL + _.keys(mems.get('_attachments'))[0] src = attchmentURL } - if(config.models[0].attributes.rows[0].doc.code == 'nationbell' && mems.get("community") == 'nationbell'){ + if(config.models[0].attributes.rows[0].doc.type == 'nation' && mems.get("community") == 'nationbell' || config.models[0].attributes.rows[0].doc.type == 'community'){ viewtext += '' + mems.get('firstName') + ' ' + mems.get('lastName') + ''+roleOfMem+''+App.languageDict.attributes.Send_Email+'' - } - else if (config.models[0].attributes.rows[0].doc.type == 'community'){ - viewtext += '' + mems.get('firstName') + ' ' + mems.get('lastName') + ''+roleOfMem+''+App.languageDict.attributes.Send_Email+'' - } - else + } else { viewtext += '' + mems.get('firstName') + ' ' + mems.get('lastName') + ''+roleOfMem+'' + } var loggedIn = new App.Models.Member({ "_id": $.cookie('Member._id') }) @@ -186,10 +183,11 @@ $(function () { attchmentURL = attchmentURL + _.keys(mems.get('_attachments'))[0] src = attchmentURL } - if(config.models[0].attributes.rows[0].doc.code == 'nationbell' && mems.get("community") == 'nationbell') + if(config.models[0].attributes.rows[0].doc.type == 'nation' && mems.get("community") == 'nationbell'){ viewtext += '' + mems.get('firstName') + ' ' + mems.get('lastName') + ''+roleOfMem+''+App.languageDict.attributes.Send_Email+'' - else + } else{ viewtext += '' + mems.get('firstName') + ' ' + mems.get('lastName') + ''+roleOfMem+'' + } var loggedIn = new App.Models.Member({ "_id": $.cookie('Member._id') })