Skip to content

Delete Members Pending #340

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
isabelbaez wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Delete Members Pending #340

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 5 additions & 1 deletion browser/templates/murmur/group_page.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,7 @@ <h3>Members List</h3>

{% if group_info.admin %}
<td><input class="checkbox checkbox-user" type="checkbox" id ={{ member.id }}></td>

<td>{{ member.email }}</td>
<td>{{ member.joined }}</td>
{% if member.admin %}
Expand Down Expand Up @@ -164,7 +165,10 @@ <h3>Members List</h3>
{% endfor %}
{% for member in group_info.members_pending %}
<tr>
<td></td>

{% if group_info.admin %}
<td><input class="checkbox checkbox-user" type="checkbox" id ={{ member.id }}></td>
{% endif %}
<td><i>{{ member.email }} (pending)</i></td>
<td>{{ member.joined }}</td>
{% if member.admin %}
Expand Down
9 changes: 8 additions & 1 deletion engine/main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ def group_info_page(user, group_name):
})

for mp in MemberGroupPending.objects.filter(group=group):
res['members_pending'].append({ 'id':mp.id,
res['members_pending'].append({ 'id': mp.id,
'email': mp.member.email,
'admin': False,
'mod': False,
Expand Down Expand Up @@ -169,6 +169,7 @@ def edit_members_table(group_name, toDelete, toAdmin, toMod, user):
try:
group = Group.objects.get(name=group_name)
membergroups = MemberGroup.objects.filter(group=group).select_related()
membergroupspending = MemberGroupPending.objects.filter(group=group).select_related()
toDelete_list = toDelete.split(',')
toAdmin_list = toAdmin.split(',')
toMod_list = toMod.split(',')
Expand Down Expand Up @@ -203,6 +204,12 @@ def email_on_role_change(type, group, email):
if membergroup.id in toDelete_realList:
membergroup.delete()
email_on_role_change("delete", membergroup.group.name, membergroup.member.email)

for membergrouppending in membergroupspending:
if membergrouppending.id in toDelete_realList:
membergrouppending.delete()
email_on_role_change("delete", membergrouppending.group.name, membergrouppending.member.email)

for membergroup in membergroups:
if membergroup.id in toAdmin_realList:
membergroup.admin = True
Expand Down