projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
4291: Workbench Collection sharing buttons are actual buttons.
[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 86e982368c04425a98ea3d9537bfa10507af3b9b..43a88955f042301b673fe6c4e067039a9ee142ff 100644
(file)
--- a/
apps/workbench/app/controllers/users_controller.rb
+++ b/
apps/workbench/app/controllers/users_controller.rb
@@
-35,7
+35,7
@@
class UsersController < ApplicationController
def activity
@breadcrumb_page_name = nil
def activity
@breadcrumb_page_name = nil
- @users = User.limit(params[:limit]
|| 1000).all
+ @users = User.limit(params[:limit]
)
@user_activity = {}
@activity = {
logins: {},
@user_activity = {}
@activity = {
logins: {},
@@
-88,7
+88,7
@@
class UsersController < ApplicationController
def storage
@breadcrumb_page_name = nil
def storage
@breadcrumb_page_name = nil
- @users = User.limit(params[:limit]
|| 1000).all
+ @users = User.limit(params[:limit]
)
@user_storage = {}
total_storage = {}
@log_date = {}
@user_storage = {}
total_storage = {}
@log_date = {}
@@
-159,7
+159,7
@@
class UsersController < ApplicationController
@persist_state[uuid] = 'cache'
end
@persist_state[uuid] = 'cache'
end
- Link.
limit(1000).
filter([['head_uuid', 'in', collection_uuids],
+ Link.filter([['head_uuid', 'in', collection_uuids],
['link_class', 'in', ['tag', 'resources']]]).
each do |link|
case link.link_class
['link_class', 'in', ['tag', 'resources']]]).
each do |link|
case link.link_class