projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'main' from workbench2.git
[arvados.git]
/
apps
/
workbench
/
app
/
controllers
/
repositories_controller.rb
diff --git
a/apps/workbench/app/controllers/repositories_controller.rb
b/apps/workbench/app/controllers/repositories_controller.rb
index 5ca6f22b02f54bf2ea3b213b7106717cd10c845b..953ee1dd2190ee02b7a5a651176ea8a162dbc928 100644
(file)
--- a/
apps/workbench/app/controllers/repositories_controller.rb
+++ b/
apps/workbench/app/controllers/repositories_controller.rb
@@
-3,7
+3,7
@@
# SPDX-License-Identifier: AGPL-3.0
class RepositoriesController < ApplicationController
# SPDX-License-Identifier: AGPL-3.0
class RepositoriesController < ApplicationController
- before_
filter
:set_share_links, if: -> { defined? @object }
+ before_
action
:set_share_links, if: -> { defined? @object }
def index_pane_list
%w(repositories help)
def index_pane_list
%w(repositories help)
@@
-50,7
+50,7
@@
class RepositoriesController < ApplicationController
if !owner_filter.andand.any?
filters = @filters + [["owner_uuid", "=", current_user.uuid]]
if !owner_filter.andand.any?
filters = @filters + [["owner_uuid", "=", current_user.uuid]]
- my_repos = Repository.all.order("name ASC").limit(limit).offset(offset).filter(filters).results
+ my_repos = Repository.all.order("name ASC").limit(limit).
with_count("none").
offset(offset).filter(filters).results
else # done fetching all owned repositories
my_repos = []
end
else # done fetching all owned repositories
my_repos = []
end
@@
-64,7
+64,7
@@
class RepositoriesController < ApplicationController
end
filters = @filters + [["owner_uuid", "!=", current_user.uuid]]
end
filters = @filters + [["owner_uuid", "!=", current_user.uuid]]
- other_repos = Repository.all.order("name ASC").limit(limit).offset(offset).filter(filters).results
+ other_repos = Repository.all.order("name ASC").limit(limit).
with_count("none").
offset(offset).filter(filters).results
@objects = (my_repos + other_repos).first(limit)
end
@objects = (my_repos + other_repos).first(limit)
end