projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
3775: Merge branch 'master' into 3775-fetch-git-repo
[arvados.git]
/
apps
/
workbench
/
app
/
models
/
arvados_base.rb
diff --git
a/apps/workbench/app/models/arvados_base.rb
b/apps/workbench/app/models/arvados_base.rb
index 7bc043cc9e2ccc7fbc79a130bf7ee2d83940815b..e0e93b9e2d0828cef0149f95fe51c817260ef3c7 100644
(file)
--- 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
(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)
end
def attribute_editable?(attr, ever=nil)
@@
-379,7
+379,7
@@
class ArvadosBase < ActiveRecord::Base
self.class.to_s.underscore
end
self.class.to_s.underscore
end
- def friendly_link_name
+ def friendly_link_name
lookup=nil
(name if self.respond_to? :name) || default_name
end
(name if self.respond_to? :name) || default_name
end