projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
2760: Exclude system objects like VMs and repos from folder behavior.
[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 cc9b9bb058cea3e2696eaf37a85559fde93d1431..c1656bde692ea1b0d454585663b1aca7ec4d3a8a 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,9
+22,9
@@
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 attributes_for_display
end
def attributes_for_display
@@
-38,4
+38,15
@@
class User < ArvadosBase
def friendly_link_name
[self.first_name, self.last_name].compact.join ' '
end
def friendly_link_name
[self.first_name, self.last_name].compact.join ' '
end
+
+ def unsetup
+ self.private_reload(arvados_api_client.api(self.class,
+ "/#{self.uuid}/unsetup",
+ {}))
+ end
+
+ def self.setup params
+ arvados_api_client.api(self, "/setup", params)
+ end
+
end
end