projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '2640-folder-api' into 1970-folder-view
[arvados.git]
/
apps
/
workbench
/
app
/
controllers
/
api_client_authorizations_controller.rb
diff --git
a/apps/workbench/app/controllers/api_client_authorizations_controller.rb
b/apps/workbench/app/controllers/api_client_authorizations_controller.rb
index 24b4ae3185d4701c7152af5a8f582f2e97ecb424..8385b6b2d056b7b2b84f7f75f6194a329b417123 100644
(file)
--- a/
apps/workbench/app/controllers/api_client_authorizations_controller.rb
+++ b/
apps/workbench/app/controllers/api_client_authorizations_controller.rb
@@
-7,7
+7,7
@@
class ApiClientAuthorizationsController < ApplicationController
filtered = m.to_ary.reject do |x|
x.api_client_id == 0 or (x.expires_at and x.expires_at < Time.now) rescue false
end
filtered = m.to_ary.reject do |x|
x.api_client_id == 0 or (x.expires_at and x.expires_at < Time.now) rescue false
end
- ArvadosApiClient::patch_paging_vars(filtered, items_available, offset, limit)
+ ArvadosApiClient::patch_paging_vars(filtered, items_available, offset, limit
, nil
)
@objects = ArvadosResourceList.new(ApiClientAuthorization)
@objects.results= filtered
super
@objects = ArvadosResourceList.new(ApiClientAuthorization)
@objects.results= filtered
super