Skip to content
This repository has been archived by the owner on Aug 21, 2018. It is now read-only.

disable email for community member (connects #1046) #1055

Open
wants to merge 2 commits into
base: dev
Choose a base branch
from
Open

disable email for community member (connects #1046) #1055

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5b515cd
disable email
razu9861 Oct 27, 2017
ed6579f
add wait time
lmmrssa Nov 3, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions app/MyApp/app/views/CourseMembers.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,11 +82,11 @@ $(function () {
attchmentURL = attchmentURL + _.keys(mems.get('_attachments'))[0]
src = attchmentURL
}
if(config.models[0].attributes.rows[0].doc.type == 'nation' && mems.get("community") == 'nationbell' || config.models[0].attributes.rows[0].doc.type == 'community'){
viewtext += '<tr><td><img width="45px" height="45px" src="' + src + '"/></td><td>' + mems.get('firstName') + ' ' + mems.get('lastName') + '</td><td>'+roleOfMem+'</td><td><input type="checkbox" name="courseMember" value="' + mail + '">'+App.languageDict.attributes.Send_Email+'</td>'
} else {
viewtext += '<tr><td><img width="45px" height="45px" src="' + src + '"/></td><td>' + mems.get('firstName') + ' ' + mems.get('lastName') + '</td><td>'+roleOfMem+'</td><td></td>'
}
viewtext += '<tr><td><img width="45px" height="45px" src="' + src + '"/></td><td>' + mems.get('firstName') + ' ' + mems.get('lastName') + '</td><td>'+roleOfMem+'</td><td>'+ mems.get('community') +'</td>';
if(mems.get("community")==config.models[0].attributes.rows[0].doc.code)
viewtext += '<td><input type="checkbox" name="courseMember" value="' + mail + '">'+App.languageDict.attributes.Send_Email+'</td><td></td>';
else
viewtext += '<td></td><td></td>';
var loggedIn = new App.Models.Member({
"_id": $.cookie('Member._id')
})
Expand Down Expand Up @@ -183,7 +183,7 @@ $(function () {
attchmentURL = attchmentURL + _.keys(mems.get('_attachments'))[0]
src = attchmentURL
}
if(config.models[0].attributes.rows[0].doc.type == 'nation' && mems.get("community") == 'nationbell'){
if(config.models[0].attributes.rows[0].doc.code == mems.get("community")){
viewtext += '<tr><td><img width="45px" height="45px" src="' + src + '"/></td><td>' + mems.get('firstName') + ' ' + mems.get('lastName') + '</td><td>'+roleOfMem+'</td><td><input type="checkbox" name="courseMember" value="' + mail + '">'+App.languageDict.attributes.Send_Email+'</td>'
} else{
viewtext += '<tr><td><img width="45px" height="45px" src="' + src + '"/></td><td>' + mems.get('firstName') + ' ' + mems.get('lastName') + '</td><td>'+roleOfMem+'</td><td></td>'
Expand Down
2 changes: 1 addition & 1 deletion tests/report_test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ Scenario('Test for Add Report', (I) => {
I.waitForVisible(ActReport);
I.waitForEnabled(ActReport);
I.click(ActReport);
I.wait(5)
I.wait(10)
I.seeInCurrentUrl('http://127.0.0.1:5981/apps/_design/bell/MyApp/index.html#logreports');
I.wait(2);
I.waitForVisible(dateVis);
Expand Down