Provide a seperate admin table so that applicants dont see lead

opentech/apply/funds/tables.py

@@ -14,17 +14,17 @@ from .widgets import Select2MultiCheckboxesWidget
 
 
 class SubmissionsTable(tables.Table):
+    """Base table for listing submissions, do not include admin data to this table"""
     title = tables.LinkColumn('funds:submission', args=[A('pk')], orderable=True)
     submit_time = tables.DateColumn(verbose_name="Submitted")
     status_name = tables.Column(verbose_name="Status")
     stage = tables.Column(verbose_name="Type")
     page = tables.Column(verbose_name="Fund")
-    lead = tables.Column(accessor='round.specific.lead', verbose_name='Lead')
 
     class Meta:
         model = ApplicationSubmission
         fields = ('title', 'status_name', 'stage', 'page', 'round', 'submit_time')
-        sequence = ('title', 'status_name', 'stage', 'page', 'round', 'lead', 'submit_time')
+        sequence = ('title', 'status_name', 'stage', 'page', 'round', 'submit_time')
         template = 'funds/tables/table.html'
         row_attrs = {
             'class': lambda record: '' if record.active else 'is-inactive'
@@ -37,6 +37,14 @@ class SubmissionsTable(tables.Table):
         return mark_safe(f'<span>{ value }</span>')
 
 
+class AdminSubmissionsTable(SubmissionsTable):
+    """Adds admin only columns to the submissions table"""
+    lead = tables.Column(accessor='round.specific.lead', verbose_name='Lead')
+
+    class Meta:
+        sequence = ('title', 'status_name', 'stage', 'page', 'round', 'lead', 'submit_time')
+
+
 def get_used_rounds(request):
     return Round.objects.filter(submissions__isnull=False).distinct()
 

opentech/apply/funds/views.py

@@ -15,13 +15,13 @@ from opentech.apply.activity.models import Activity
 
 from .forms import ProgressSubmissionForm, UpdateSubmissionLeadForm
 from .models import ApplicationSubmission
-from .tables import SubmissionsTable, SubmissionFilter, SubmissionFilterAndSearch
+from .tables import AdminSubmissionsTable, SubmissionFilter, SubmissionFilterAndSearch
 from .workflow import SingleStage, DoubleStage
 
 
 class SubmissionListView(AllActivityContextMixin, SingleTableMixin, FilterView):
     template_name = 'funds/submissions.html'
-    table_class = SubmissionsTable
+    table_class = AdminSubmissionsTable
 
     filterset_class = SubmissionFilter
 
@@ -32,7 +32,7 @@ class SubmissionListView(AllActivityContextMixin, SingleTableMixin, FilterView):
 
 class SubmissionSearchView(SingleTableMixin, FilterView):
     template_name = 'funds/submissions_search.html'
-    table_class = SubmissionsTable
+    table_class = AdminSubmissionsTable
 
     filterset_class = SubmissionFilterAndSearch