diff --git a/coldfront/core/project/templates/project/project_detail.html b/coldfront/core/project/templates/project/project_detail.html
index 1da913b84..86f4f3585 100644
--- a/coldfront/core/project/templates/project/project_detail.html
+++ b/coldfront/core/project/templates/project/project_detail.html
@@ -97,8 +97,8 @@
Resource Type |
Location |
User Count |
- Space (TB) |
- Used (TB) |
+ Space |
+ Used |
Monthly Cost |
Actions |
@@ -642,36 +642,11 @@ lfrtip',
order: [[ 3, "desc" ]],
- buttons: [
- {
- name: 'toggleusers',
- text: function() {
- return $('#projectuser_table').attr('filter') == "on" ? 'Show All Users' : "Show Active Users"
- },
- action: function(e, dt, node, config) {
- var table = $('#projectuser_table');
- var filter = table.attr('filter') === "on" ? 'off' : "on";
- document.querySelector('#projectuser_table').setAttribute('filter', filter);
- if (filter == 'on') {
- $.fn.dataTable.ext.search.push(
- function(settings, data, dataIndex) {
- return $(dt.row(dataIndex).node()).attr('status') == "Active";
- });
- } else {$.fn.dataTable.ext.search.pop();}
- table.DataTable().draw();
- this.text(filter == 'on' ? 'Show All Users' : "Show Active Users")
- }
- }
- ]}
- );
+ });
$('#invoice_table').DataTable({
'aoColumnDefs': [{
diff --git a/coldfront/core/project/views.py b/coldfront/core/project/views.py
index 085aef9b9..143d4e89c 100644
--- a/coldfront/core/project/views.py
+++ b/coldfront/core/project/views.py
@@ -180,7 +180,8 @@ def get_context_data(self, **kwargs):
attributes_with_usage.remove(a)
# Only show 'Active Users'
- project_users = self.object.projectuser_set.order_by('user__username')
+ project_users = self.object.projectuser_set.filter(
+ status__name='Active').order_by('user__username')
context['mailto'] = 'mailto:' + ','.join([u.user.email for u in project_users])