From c84237c2b2d579b4e4e285744eeda0667f9e44cd Mon Sep 17 00:00:00 2001 From: Tom Clegg Date: Wed, 17 Jul 2013 14:26:21 -0400 Subject: [PATCH] count files instead of specimens on dashboard --- apps/workbench/app/views/users/home.html.erb | 10 +++++----- sdk/cli/bin/arv-run-pipeline-instance | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/apps/workbench/app/views/users/home.html.erb b/apps/workbench/app/views/users/home.html.erb index 7ae47eb28e..fddd76c610 100644 --- a/apps/workbench/app/views/users/home.html.erb +++ b/apps/workbench/app/views/users/home.html.erb @@ -28,19 +28,19 @@

Account summary

- <% [Human, Specimen, Trait, Collection, PipelineTemplate, PipelineInstance].each do |aclass| %> + <% [Human, Trait, Collection, 'File', PipelineTemplate, PipelineInstance].each do |aclass| %>
- <% if [Human, Specimen, Trait, Collection].index aclass %> - <%= aclass.limit(4000).where({}).count %> + <% if aclass == 'File' %> + <%= Collection.limit(4000).where({}).collect(&:files).flatten(1).count %> <% else %> - <%= aclass.limit(1000).where({owner_uuid:current_user.uuid}).count %> + <%= aclass.limit(4000).where({}).count %> <% end %>
<%= raw(aclass.to_s.pluralize.underscore.gsub '_', ' ') %>
-<% end %> + <% end %>
diff --git a/sdk/cli/bin/arv-run-pipeline-instance b/sdk/cli/bin/arv-run-pipeline-instance index 0842225cb8..251d378da2 100755 --- a/sdk/cli/bin/arv-run-pipeline-instance +++ b/sdk/cli/bin/arv-run-pipeline-instance @@ -280,7 +280,7 @@ class JobCache if j.is_a? Hash and j[:uuid] @cache[j[:uuid]] = j else - debuglog "create job: #{j[:errors] rescue nil}" + debuglog "create job: #{j[:errors] rescue nil}", 0 nil end end @@ -429,7 +429,7 @@ class WhRunPipelineInstance debuglog "component #{cname} new job #{job[:uuid]}" c[:job] = job else - debuglog "component #{cname} new job failed: #{job[:errors]}" + debuglog "component #{cname} new job failed" end end end -- 2.30.2