projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
5145: while combining colletions, append an integer for any duplicate files.
[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..7aaa4fe93951ca831add8b7bae6778e251b8b871 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
@@
-32,15
+27,20
@@
class User < ArvadosBase
{}))
end
{}))
end
+ def contents params={}
+ Group.contents params.merge(uuid: self.uuid)
+ end
+
def attributes_for_display
super.reject { |k,v| %w(owner_uuid default_owner_uuid identity_url prefs).index k }
end
def attributes_for_display
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, ever=nil)
+ (ever or not (self.uuid.andand.match(/000000000000000$/) and
+ self.is_admin)) and super
end
end
- def friendly_link_name
+ def friendly_link_name
lookup=nil
[self.first_name, self.last_name].compact.join ' '
end
[self.first_name, self.last_name].compact.join ' '
end
@@
-54,4
+54,10
@@
class User < ArvadosBase
arvados_api_client.api(self, "/setup", params)
end
arvados_api_client.api(self, "/setup", params)
end
+ def update_profile params
+ self.private_reload(arvados_api_client.api(self.class,
+ "/#{self.uuid}/profile",
+ params))
+ end
+
end
end