Merge 054fa12 into 0cb5bd6

hepdata/modules/dashboard/api.py

@@ -174,10 +174,11 @@ def list_submission_titles(current_user):
     titles = []
     for hepsubmission in hepdata_submission_records:
         publication_record = get_record_by_id(int(hepsubmission.publication_recid))
-        titles.append({
-            'id': int(hepsubmission.publication_recid),
-            'title': publication_record['title']
-        })
+        if publication_record:
+            titles.append({
+                'id': int(hepsubmission.publication_recid),
+                'title': publication_record['title']
+            })
 
     return titles
 
@@ -203,7 +204,7 @@ def _prepare_submission_query(current_user):
             SubmissionParticipant.publication_recid
         )
 
-        query.filter(
+        query = query.filter(
             or_(HEPSubmission.coordinator == int(current_user.get_id()),
                 HEPSubmission.publication_recid.in_(inner_query))
         )

hepdata/modules/dashboard/views.py

@@ -117,6 +117,7 @@ def dashboard_submissions():
     total_pages = int(math.ceil(total_records / size))
 
     ctx = {
+        'user_is_admin': has_role(current_user, 'admin'),
         'modify_query': modify_query,
         'submissions': submission_meta,
         'submission_stats': submission_stats

tests/dashboard_test.py

@@ -171,11 +171,17 @@ def test_submissions_participant(app, load_submission):
             'inspire_id': '1487726'
         })
         hepsubmission = get_or_create_hepsubmission(record_information['recid'])
+        db.session.add(hepsubmission)
 
         user = User(email='test@test.com', password='hello1', active=True)
         db.session.add(user)
         db.session.commit()
 
+        # Check the user doesn't see the record before they are a participant
+        assert(get_submission_count(user) == 0)
+        assert(list_submission_titles(user) == [])
+
+        # Add the user as a participant
         participant = SubmissionParticipant(
             publication_recid=record_information['recid'],
             role="uploader",