aboutsummaryrefslogtreecommitdiff
path: root/wqflask
diff options
context:
space:
mode:
authorzsloan2020-06-26 14:45:35 -0500
committerzsloan2020-06-26 14:45:35 -0500
commite100f2dd564044006f09e94276a98607856f1c8f (patch)
tree8393df8bb213f6995cace1d5dc782a9af5984be9 /wqflask
parent297391cd25c5ec5bcb72de9636e1a08f32175a6a (diff)
downloadgenenetwork2-e100f2dd564044006f09e94276a98607856f1c8f.tar.gz
Fixed issue where option to add members to an existing group was in the wrong place
Diffstat (limited to 'wqflask')
-rw-r--r--wqflask/wqflask/templates/admin/view_group.html13
1 files changed, 11 insertions, 2 deletions
diff --git a/wqflask/wqflask/templates/admin/view_group.html b/wqflask/wqflask/templates/admin/view_group.html
index b797cd70..9e3cce7b 100644
--- a/wqflask/wqflask/templates/admin/view_group.html
+++ b/wqflask/wqflask/templates/admin/view_group.html
@@ -44,7 +44,7 @@
<tr>
<td style="text-align: center; padding: 0px 10px 2px 10px;"><input type="checkbox" name="admin_id" value="{{ admin.user_id }}"></td>
<td align="right">{{ loop.index }}</td>
- <td>{% if 'full_name' in admin %}{{ admin.full_name }}{% else %}N/A{% endif %}</td>
+ <td>{% if 'full_name' in admin %}{{ admin.full_name }}{% elif 'name' in admin %}{{ admin.name }}{% else %}N/A{% endif %}</td>
<td>{% if 'email_address' in admin %}{{ admin.email_address }}{% else %}N/A{% endif %}</td>
<td>{% if 'organization' in admin %}{{ admin.organization }}{% else %}N/A{% endif %}</td>
</tr>
@@ -81,7 +81,7 @@
<tr>
<td style="text-align: center; padding: 0px 10px 2px 10px;"><input type="checkbox" name="member_id" value="{{ member.user_id }}"></td>
<td align="right">{{ loop.index }}</td>
- <td>{% if 'full_name' in member %}{{ member.full_name }}{% else %}N/A{% endif %}</td>
+ <td>{% if 'full_name' in member %}{{ member.full_name }}{% elif 'name' in admin %}{{ admin.name }}{% else %}N/A{% endif %}</td>
<td>{% if 'email_address' in member %}{{ member.email_address }}{% else %}N/A{% endif %}</td>
<td>{% if 'organization' in member %}{{ member.organization }}{% else %}N/A{% endif %}</td>
</tr>
@@ -99,6 +99,15 @@
{% endif %}
{% else %}
There are currently no members in this group.
+ {% if user_is_admin == true %}
+ <div style="margin-top: 20px;">
+ <span>E-mail of user to add to members (multiple e-mails can be added separated by commas):</span>
+ <input type="text" size="60" name="member_emails_to_add" placeholder="Enter E-mail(s)" value="">
+ </div>
+ <div style="margin-bottom: 30px; margin-top: 20px;">
+ <button type="button" id="add_members" class="btn btn-primary" data-usertype="member" data-url="/groups/add_members">Add Member(s)</button>
+ </div>
+ {% endif %}
{% endif %}
</div>
</div>