[ARVADOS] created: 52bf3c0924da239488fff3ed9907c3478ee44e6b
git at public.curoverse.com
git at public.curoverse.com
Tue May 27 11:10:06 EDT 2014
at 52bf3c0924da239488fff3ed9907c3478ee44e6b (commit)
commit 52bf3c0924da239488fff3ed9907c3478ee44e6b
Author: Tom Clegg <tom at curoverse.com>
Date: Tue May 27 11:08:25 2014 -0400
2760: Exclude system objects like VMs and repos from folder behavior.
diff --git a/apps/workbench/app/models/arvados_base.rb b/apps/workbench/app/models/arvados_base.rb
index 7d86037..2c2963c 100644
--- a/apps/workbench/app/models/arvados_base.rb
+++ b/apps/workbench/app/models/arvados_base.rb
@@ -289,6 +289,10 @@ class ArvadosBase < ActiveRecord::Base
current_user
end
+ def self.goes_in_folders?
+ false
+ end
+
def editable?
(current_user and current_user.is_active and
(current_user.is_admin or
diff --git a/apps/workbench/app/models/collection.rb b/apps/workbench/app/models/collection.rb
index 2346a27..2fe4e2b 100644
--- a/apps/workbench/app/models/collection.rb
+++ b/apps/workbench/app/models/collection.rb
@@ -8,6 +8,10 @@ class Collection < ArvadosBase
!!locator.to_s.match("^#{MD5_EMPTY}(\\+.*)?\$")
end
+ def self.goes_in_folders?
+ true
+ end
+
def content_summary
human_readable_bytes_html(total_bytes) + " " + super
end
diff --git a/apps/workbench/app/models/group.rb b/apps/workbench/app/models/group.rb
index 8d8d390..638f6e8 100644
--- a/apps/workbench/app/models/group.rb
+++ b/apps/workbench/app/models/group.rb
@@ -1,4 +1,8 @@
class Group < ArvadosBase
+ def self.goes_in_folders?
+ true
+ end
+
def contents params={}
res = arvados_api_client.api self.class, "/#{self.uuid}/contents", {
_method: 'GET'
diff --git a/apps/workbench/app/models/human.rb b/apps/workbench/app/models/human.rb
index 31653bd..3880f05 100644
--- a/apps/workbench/app/models/human.rb
+++ b/apps/workbench/app/models/human.rb
@@ -1,2 +1,5 @@
class Human < ArvadosBase
+ def self.goes_in_folders?
+ true
+ end
end
diff --git a/apps/workbench/app/models/job.rb b/apps/workbench/app/models/job.rb
index eb81f40..56428ab 100644
--- a/apps/workbench/app/models/job.rb
+++ b/apps/workbench/app/models/job.rb
@@ -1,4 +1,8 @@
class Job < ArvadosBase
+ def self.goes_in_folders?
+ true
+ end
+
def attribute_editable?(attr)
false
end
diff --git a/apps/workbench/app/models/pipeline_instance.rb b/apps/workbench/app/models/pipeline_instance.rb
index 45e472f..aad7cfc 100644
--- a/apps/workbench/app/models/pipeline_instance.rb
+++ b/apps/workbench/app/models/pipeline_instance.rb
@@ -1,6 +1,10 @@
class PipelineInstance < ArvadosBase
attr_accessor :pipeline_template
+ def self.goes_in_folders?
+ true
+ end
+
def update_job_parameters(new_params)
self.components[:steps].each_with_index do |step, i|
step[:params].each do |param|
diff --git a/apps/workbench/app/models/pipeline_template.rb b/apps/workbench/app/models/pipeline_template.rb
index fb12a81..82e3d30 100644
--- a/apps/workbench/app/models/pipeline_template.rb
+++ b/apps/workbench/app/models/pipeline_template.rb
@@ -1,4 +1,8 @@
class PipelineTemplate < ArvadosBase
+ def self.goes_in_folders?
+ true
+ end
+
def self.creatable?
false
end
diff --git a/apps/workbench/app/models/specimen.rb b/apps/workbench/app/models/specimen.rb
index fa7fbbf..68c0038 100644
--- a/apps/workbench/app/models/specimen.rb
+++ b/apps/workbench/app/models/specimen.rb
@@ -1,2 +1,5 @@
class Specimen < ArvadosBase
+ def self.goes_in_folders?
+ true
+ end
end
diff --git a/apps/workbench/app/models/trait.rb b/apps/workbench/app/models/trait.rb
index ab65ad5..cf7099d 100644
--- a/apps/workbench/app/models/trait.rb
+++ b/apps/workbench/app/models/trait.rb
@@ -1,2 +1,5 @@
class Trait < ArvadosBase
+ def self.goes_in_folders?
+ true
+ end
end
diff --git a/apps/workbench/app/views/application/_selection_checkbox.html.erb b/apps/workbench/app/views/application/_selection_checkbox.html.erb
index 7af1175..9645455 100644
--- a/apps/workbench/app/views/application/_selection_checkbox.html.erb
+++ b/apps/workbench/app/views/application/_selection_checkbox.html.erb
@@ -1,4 +1,4 @@
-<%if object %>
+<%if object and object.class.goes_in_folders? %>
<% fn = if defined? friendly_name
friendly_name
else
diff --git a/apps/workbench/app/views/application/_show_recent.html.erb b/apps/workbench/app/views/application/_show_recent.html.erb
index c36f27c..800263f 100644
--- a/apps/workbench/app/views/application/_show_recent.html.erb
+++ b/apps/workbench/app/views/application/_show_recent.html.erb
@@ -15,7 +15,9 @@
<table class="table table-condensed arv-index">
<thead>
<tr>
- <th></th>
+ <% if objects.first and objects.first.class.goes_in_folders? %>
+ <th></th>
+ <% end %>
<th></th>
<% objects.first.attributes_for_display.each do |attr, attrvalue| %>
<% next if attr_blacklist.index(" "+attr) %>
@@ -32,9 +34,11 @@
<tbody>
<% objects.each do |object| %>
<tr data-object-uuid="<%= object.uuid %>">
- <td>
- <%= render :partial => "selection_checkbox", :locals => {:object => object} %>
- </td>
+ <% if objects.first.class.goes_in_folders? %>
+ <td>
+ <%= render :partial => "selection_checkbox", :locals => {:object => object} %>
+ </td>
+ <% end %>
<td>
<%= render :partial => "show_object_button", :locals => {object: object, size: 'xs'} %>
</td>
diff --git a/services/api/app/controllers/arvados/v1/groups_controller.rb b/services/api/app/controllers/arvados/v1/groups_controller.rb
index 49f0b02..4bccbcc 100644
--- a/services/api/app/controllers/arvados/v1/groups_controller.rb
+++ b/services/api/app/controllers/arvados/v1/groups_controller.rb
@@ -20,33 +20,25 @@ class Arvados::V1::GroupsController < ApplicationController
offset_all = @offset
@orders = []
- ArvadosModel.descendants.reject(&:abstract_class?).sort_by(&:to_s).
- each do |klass|
- case klass.to_s
- # We might expect klass==Link etc. here, but we would be
- # disappointed: when Rails reloads model classes, we get two
- # distinct classes called Link which do not equal each
- # other. But we can still rely on klass.to_s to be "Link".
- when 'ApiClientAuthorization', 'UserAgreement', 'Link'
- # Do not want.
- else
- @objects = klass.readable_by(*@read_users)
- cond_sql = "#{klass.table_name}.owner_uuid = ?"
- cond_params = [@object.uuid]
- if params[:include_linked]
- cond_sql += " OR #{klass.table_name}.uuid IN (SELECT head_uuid FROM links WHERE link_class=#{klass.sanitize 'name'} AND links.tail_uuid=#{klass.sanitize @object.uuid})"
- end
- @objects = @objects.where(cond_sql, *cond_params).order("#{klass.table_name}.uuid")
- @limit = limit_all - all_objects.count
- apply_where_limit_order_params
- items_available = @objects.
- except(:limit).except(:offset).
- count(:id, distinct: true)
- all_available += items_available
- @offset = [@offset - items_available, 0].max
-
- all_objects += @objects.to_a
+ [Group, Job, PipelineInstance, PipelineTemplate,
+ Human, Specimen, Trait,
+ Collection].each do |klass|
+ @objects = klass.readable_by(*@read_users)
+ cond_sql = "#{klass.table_name}.owner_uuid = ?"
+ cond_params = [@object.uuid]
+ if params[:include_linked]
+ cond_sql += " OR #{klass.table_name}.uuid IN (SELECT head_uuid FROM links WHERE link_class=#{klass.sanitize 'name'} AND links.tail_uuid=#{klass.sanitize @object.uuid})"
end
+ @objects = @objects.where(cond_sql, *cond_params).order("#{klass.table_name}.uuid")
+ @limit = limit_all - all_objects.count
+ apply_where_limit_order_params
+ items_available = @objects.
+ except(:limit).except(:offset).
+ count(:id, distinct: true)
+ all_available += items_available
+ @offset = [@offset - items_available, 0].max
+
+ all_objects += @objects.to_a
end
@objects = all_objects || []
@links = Link.where('link_class=? and tail_uuid=?'\
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list