projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
18794: Add version metric to RailsAPI.
[arvados.git]
/
services
/
api
/
app
/
controllers
/
database_controller.rb
diff --git
a/services/api/app/controllers/database_controller.rb
b/services/api/app/controllers/database_controller.rb
index dddc3400b4eee4b0035caec86440b2113c06576a..5c4cf7bc16c22ad8d8780714d9b0165cf2c4043b 100644
(file)
--- a/
services/api/app/controllers/database_controller.rb
+++ b/
services/api/app/controllers/database_controller.rb
@@
-3,9
+3,9
@@
# SPDX-License-Identifier: AGPL-3.0
class DatabaseController < ApplicationController
# SPDX-License-Identifier: AGPL-3.0
class DatabaseController < ApplicationController
- skip_before_
filter
:find_object_by_uuid
- skip_before_
filter
:render_404_if_no_object
- before_
filter
:admin_required
+ skip_before_
action
:find_object_by_uuid
+ skip_before_
action
:render_404_if_no_object
+ before_
action
:admin_required
def reset
raise ArvadosModel::PermissionDeniedError unless Rails.env == 'test'
def reset
raise ArvadosModel::PermissionDeniedError unless Rails.env == 'test'
@@
-14,7
+14,7
@@
class DatabaseController < ApplicationController
# use @example.com email addresses when creating user records, so
# we can tell they're not valuable.
user_uuids = User.
# use @example.com email addresses when creating user records, so
# we can tell they're not valuable.
user_uuids = User.
- where('email is null or
email not like ?', '%@
example.com').
+ where('email is null or
(email not like ? and email not like ?)', '%@example.com', '%.
example.com').
collect(&:uuid)
fixture_uuids =
YAML::load_file(File.expand_path('../../../test/fixtures/users.yml',
collect(&:uuid)
fixture_uuids =
YAML::load_file(File.expand_path('../../../test/fixtures/users.yml',
@@
-75,9
+75,10
@@
class DatabaseController < ApplicationController
raise
end
raise
end
- require '
refresh_permission_view
'
+ require '
update_permissions
'
- refresh_permission_view
+ refresh_permissions
+ refresh_trashed
# Done.
send_json success: true
# Done.
send_json success: true