projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
11185: Addressed several requests:
[arvados.git]
/
apps
/
workbench
/
app
/
controllers
/
users_controller.rb
diff --git
a/apps/workbench/app/controllers/users_controller.rb
b/apps/workbench/app/controllers/users_controller.rb
index 4a88983f5045ee15e8ec6433cda93ac3b27b2edd..1a1c5f802152ffe4cdb7ff009fce0bb02c70cbc1 100644
(file)
--- a/
apps/workbench/app/controllers/users_controller.rb
+++ b/
apps/workbench/app/controllers/users_controller.rb
@@
-102,6
+102,7
@@
class UsersController < ApplicationController
filter([[:object_uuid, '=', u.uuid],
[:event_type, '=', 'user-storage-report']]).
order(:created_at => :desc).
filter([[:object_uuid, '=', u.uuid],
[:event_type, '=', 'user-storage-report']]).
order(:created_at => :desc).
+ with_count('none').
limit(1)
storage_log.each do |log_entry|
# We expect this block to only execute once since we specified limit(1)
limit(1)
storage_log.each do |log_entry|
# We expect this block to only execute once since we specified limit(1)
@@
-299,12
+300,6
@@
class UsersController < ApplicationController
@my_ssh_keys = AuthorizedKey.where(key_type: 'SSH', owner_uuid: @object.uuid)
end
@my_ssh_keys = AuthorizedKey.where(key_type: 'SSH', owner_uuid: @object.uuid)
end
- def manage_account
- repositories
- virtual_machines
- ssh_keys
- end
-
def add_ssh_key_popup
respond_to do |format|
format.html
def add_ssh_key_popup
respond_to do |format|
format.html