projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed botched 'distinct' parameter, now is a boolean instead of taking a
[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 863876137fdab5f941740e5f7bd30187415c6099..5cfa48710f88508a5feec99939d17591704e955a 100644
(file)
--- a/
apps/workbench/app/controllers/users_controller.rb
+++ b/
apps/workbench/app/controllers/users_controller.rb
@@
-74,7
+74,7
@@
class UsersController < ApplicationController
storage_log = Log.
filter([[:object_uuid, '=', u.uuid],
[:event_type, '=', 'user-storage-report']]).
storage_log = Log.
filter([[:object_uuid, '=', u.uuid],
[:event_type, '=', 'user-storage-report']]).
- order(
:created_at => :desc
).
+ order(
['created_at desc']
).
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)
@@
-122,12
+122,12
@@
class UsersController < ApplicationController
@my_jobs = Job.
limit(10).
@my_jobs = Job.
limit(10).
- order(
'created_at desc'
).
+ order(
['created_at desc']
).
where(created_by: current_user.uuid)
@my_collections = Collection.
limit(10).
where(created_by: current_user.uuid)
@my_collections = Collection.
limit(10).
- order(
'created_at desc'
).
+ order(
['created_at desc']
).
where(created_by: current_user.uuid)
collection_uuids = @my_collections.collect &:uuid
where(created_by: current_user.uuid)
collection_uuids = @my_collections.collect &:uuid
@@
-151,7
+151,7
@@
class UsersController < ApplicationController
@my_pipelines = PipelineInstance.
limit(10).
@my_pipelines = PipelineInstance.
limit(10).
- order(
'created_at desc'
).
+ order(
['created_at desc']
).
where(created_by: current_user.uuid)
respond_to do |f|
where(created_by: current_user.uuid)
respond_to do |f|