projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
5417: add additional test updates to verify Run button status when input is not readable.
[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 44d615b89fecf117dcc618e01627e1beb74e38f2..7aaa4fe93951ca831add8b7bae6778e251b8b871 100644
(file)
--- a/
apps/workbench/app/models/user.rb
+++ b/
apps/workbench/app/models/user.rb
@@
-6,15
+6,15
@@
class User < ArvadosBase
end
def self.current
end
def self.current
- res =
$
arvados_api_client.api self, '/current'
-
$
arvados_api_client.unpack_api_response(res)
+ res = arvados_api_client.api self, '/current'
+ arvados_api_client.unpack_api_response(res)
end
def self.system
end
def self.system
-
$
arvados_system_user ||= begin
-
res = $
arvados_api_client.api self, '/system'
-
$
arvados_api_client.unpack_api_response(res)
- end
+
@@
arvados_system_user ||= begin
+
res =
arvados_api_client.api self, '/system'
+
arvados_api_client.unpack_api_response(res)
+
end
end
def full_name
end
def full_name
@@
-22,31
+22,42
@@
class User < ArvadosBase
end
def activate
end
def activate
- self.private_reload($arvados_api_client.api(self.class,
- "/#{self.uuid}/activate",
- {}))
+ self.private_reload(arvados_api_client.api(self.class,
+ "/#{self.uuid}/activate",
+ {}))
+ 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
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
def unsetup
[self.first_name, self.last_name].compact.join ' '
end
def unsetup
- self.private_reload(
$
arvados_api_client.api(self.class,
-
"/#{self.uuid}/unsetup",
-
{}))
+ self.private_reload(arvados_api_client.api(self.class,
+ "/#{self.uuid}/unsetup",
+ {}))
end
def self.setup params
end
def self.setup params
- $arvados_api_client.api(self, "/setup", params)
+ 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
end