[ARVADOS] created: 1513d62bc0716698b71789f7affbf78e675cbff8

[git at public.curoverse.com]

        at  1513d62bc0716698b71789f7affbf78e675cbff8 (commit)


commit 1513d62bc0716698b71789f7affbf78e675cbff8
Author: Tom Clegg <tom at curoverse.com>
Date:   Tue Sep 23 14:32:09 2014 -0400

    3960: Make editable? return false or true, never nil.

diff --git a/apps/workbench/app/models/arvados_base.rb b/apps/workbench/app/models/arvados_base.rb
index 7bc043c..b691e6d 100644
--- a/apps/workbench/app/models/arvados_base.rb
+++ b/apps/workbench/app/models/arvados_base.rb
@@ -329,7 +329,7 @@ class ArvadosBase < ActiveRecord::Base
      (current_user.is_admin or
       current_user.uuid == self.owner_uuid or
       new_record? or
-      (writable_by.include? current_user.uuid rescue false)))
+      (writable_by.include? current_user.uuid rescue false))) or false
   end
 
   def attribute_editable?(attr, ever=nil)

commit 039e808b1be1f2106118dc20174977d8e8766125
Author: Tom Clegg <tom at curoverse.com>
Date:   Tue Sep 23 14:31:09 2014 -0400

    3960: Remove unused has_permission? method.

diff --git a/services/api/app/models/arvados_model.rb b/services/api/app/models/arvados_model.rb
index 1138bd2..376df0c 100644
--- a/services/api/app/models/arvados_model.rb
+++ b/services/api/app/models/arvados_model.rb
@@ -198,13 +198,6 @@ class ArvadosModel < ActiveRecord::Base
     attributes
   end
 
-  def has_permission? perm_type, target_uuid
-    Link.where(link_class: "permission",
-               name: perm_type,
-               tail_uuid: uuid,
-               head_uuid: target_uuid).any?
-  end
-
   protected
 
   def ensure_ownership_path_leads_to_user

-----------------------------------------------------------------------


hooks/post-receive
--