Merge pull request #38 from CDL-Dryad/in-progress

In-progress items: status display in Admin Dashboard
datadryad · Jan 6, 2020 · 2036e2e · 2036e2e
2 parents 4de32f7 + ca583e3
commit 2036e2e
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/stash/stash_engine/app/views/stash_engine/admin_datasets/_datasets_table.html.erb b/stash/stash_engine/app/views/stash_engine/admin_datasets/_datasets_table.html.erb
@@ -45,7 +45,13 @@
         <% end %>
       </td>
       <td class="c-admin-hide-border-right" id="js-curation-state-<%= dataset.identifier_id %>">
-        <%= StashEngine::CurationActivity.readable_status(dataset.status) %>
+	  <% if (dataset.resource_state == 'error') %>
+	      Merritt Error
+	  <% elsif (dataset.resource_state == 'processing') %>
+	      Processing
+	  <% else %>
+              <%= StashEngine::CurationActivity.readable_status(dataset.status) %>
+	  <% end %>
       </td>
       <td class="c-admin-hide-border-left">
         <% if %w[admin superuser].include?(current_user.role) && dataset.resource_state == 'submitted' %>