projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into 3373-improve-gatk3-snv-pipeline
[arvados.git]
/
apps
/
workbench
/
app
/
models
/
user.rb
diff --git
a/apps/workbench/app/models/user.rb
b/apps/workbench/app/models/user.rb
index 59ab1ba5addabd5962a3bd81aa5fbd44c0b21f06..9c914776a2cf43b5ef0241dfced63c0a745a1bb5 100644
(file)
--- a/
apps/workbench/app/models/user.rb
+++ b/
apps/workbench/app/models/user.rb
@@
-17,11
+17,6
@@
class User < ArvadosBase
end
end
end
end
- def owned_items
- res = arvados_api_client.api self.class, "/#{self.uuid}/owned_items"
- arvados_api_client.unpack_api_response(res)
- end
-
def full_name
(self.first_name || "") + " " + (self.last_name || "")
end
def full_name
(self.first_name || "") + " " + (self.last_name || "")
end
@@
-36,8
+31,8
@@
class User < ArvadosBase
super.reject { |k,v| %w(owner_uuid default_owner_uuid identity_url prefs).index k }
end
super.reject { |k,v| %w(owner_uuid default_owner_uuid identity_url prefs).index k }
end
- def attribute_editable?
(attr)
- (not (self.uuid.andand.match(/000000000000000$/) and self.is_admin)) and super
(attr)
+ def attribute_editable?
attr, *args
+ (not (self.uuid.andand.match(/000000000000000$/) and self.is_admin)) and super
end
def friendly_link_name
end
def friendly_link_name