Merge pull request #215 from brain-image-library/feature/ondemand

Feature/ondemand

Author: ecpantalone

ingest/templates/ingest/collection_detail.html

@@ -67,7 +67,9 @@ <h1><b>Submission Name</b> {{ collection.name }}
           <strong>This submission doesn't have any Metadata Version 1.</strong>
         </div>
       {% endif %}
-
+      <div><a href="{% url 'ingest:ondemandSubmission' collection.id %}">
+        <button class="btn btn-lg btn-primary" value="ignore" formnovalidate="">View Submission Directory</button>
+      </a></div>
       <p>
 
       <table>

ingest/urls.py

@@ -55,5 +55,6 @@
     re_path(r'^change_bil_admin_privs/$', views.change_bil_admin_privs, name = 'change_bil_admin_privs'),
     path('add_project_user/<int:pk>', views.add_project_user, name = 'add_project_user'),
     path('people_of_pi', views.people_of_pi, name = 'people_of_pi'),
-    re_path(r'^write_user_to_project_people/$', views.write_user_to_project_people, name = 'write_user_to_project_people')
+    re_path(r'^write_user_to_project_people/$', views.write_user_to_project_people, name = 'write_user_to_project_people'),
+    path('collection/ondemandSubmission/<int:pk>', views.ondemandSubmission, name = 'ondemandSubmission')
 ]

ingest/views.py

@@ -934,6 +934,18 @@ def collection_detail(request, pk):
          'descriptive_metadata_queryset': descriptive_metadata_queryset,
          'pi': pi, 'datasets_list':datasets_list})
 
+@login_required
+def ondemandSubmission(request, pk):
+    coll = Collection.objects.get(id = pk)
+    if coll.submission_status == 'SUCCESS' and coll.validation_status == 'SUCCESS':
+        first2 = coll.bil_uuid[:2]
+        second2 = coll.bil_uuid[2:4]
+        path = '/bil/data/' + first2 + '/' + second2 + '/' + coll.bil_uuid + '/'
+    else:
+        path = coll.data_path
+    od = 'https://ondemand.bil.psc.edu/pun/sys/dashboard/files/fs' + path
+    return redirect(od)
+
 class CollectionUpdate(LoginRequiredMixin, UpdateView):
     """ Edit an existing collection ."""
     model = Collection