participation/tables.py

@@ -107,6 +107,11 @@ class PoolTable(tables.Table):
 
 
 class PassageTable(tables.Table):
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        if not settings.HAS_OBSERVER:
+            del self.columns['observer']
+
     reporter = tables.LinkColumn(
         "participation:passage_detail",
         args=[tables.A("id")],
@@ -130,12 +135,16 @@ class PassageTable(tables.Table):
             'class': 'table table-condensed table-striped text-center',
         }
         model = Passage
-        fields = ('reporter', 'opponent', 'reviewer',) \
+        fields = ('reporter', 'opponent', 'reviewer', 'observer', 'solution_number', )
-            + (('observer',) if settings.HAS_OBSERVER else ()) \
-            + ('solution_number', )
 
 
 class NoteTable(tables.Table):
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        if not settings.HAS_OBSERVER:
+            del self.columns['observer_writing']
+            del self.columns['observer_oral']
+
     jury = tables.Column(
         attrs={
             "td": {
@@ -161,6 +170,4 @@ class NoteTable(tables.Table):
         }
         model = Note
         fields = ('jury', 'reporter_writing', 'reporter_oral', 'opponent_writing', 'opponent_oral',
-                  'reviewer_writing', 'reviewer_oral',) + \
+                  'reviewer_writing', 'reviewer_oral', 'observer_writing', 'observer_oral', 'update',)
-                 (('observer_writing', 'observer_oral') if settings.HAS_OBSERVER else ()) + \
-                 ('update',)

registration/templates/search/indexes/registration/adminregistration_text.txt

@@ -0,0 +1,3 @@
+{{ object.user.last_name }}
+{{ object.user.first_name }}
+{{ object.user.email }}