diff --git a/app/controllers/admin_controller.rb b/app/controllers/admin_controller.rb index daca6c4..a1c1d71 100644 --- a/app/controllers/admin_controller.rb +++ b/app/controllers/admin_controller.rb @@ -1,6 +1,6 @@ class AdminController < ApplicationController - # before_action :authenticate_user! - # before_action :admin_only + before_action :authenticate_user! + before_action :admin_only # def status # end @@ -28,11 +28,11 @@ class AdminController < ApplicationController # private - # def admin_only - # unless current_user.is_admin? - # head :forbidden - # # redirect_to :back, :alert => "Access denied." - # end - # end + def admin_only + unless current_user.admin_role? + head :forbidden + # redirect_to :back, :alert => "Access denied." + end + end end diff --git a/app/views/packages/browse.slim b/app/views/packages/browse.slim index 1a23163..98393f7 100644 --- a/app/views/packages/browse.slim +++ b/app/views/packages/browse.slim @@ -18,7 +18,7 @@ .cell.pkgcard data-equalizer-watch=true a.black href=package_path(name: pkg.name) .image - = small_img(screenshots_visible_to_user(pkg, session).first, cls: '') + = small_img(pkg.screenshots.accessible_by(current_ability, :view).first, cls: '') .text.pkgname = pkg.name .text @@ -29,7 +29,7 @@ .small-12.medium-4.cell.pkgcard a.black href=package_path(name: pkg.name) .image - = small_img(screenshots_visible_to_user(pkg, session).first, cls: '') + = small_img(pkg.screenshots.accessible_by(current_ability, :view).first, cls: '') .small-12.medium-8.cell h2 a href=package_path(name: pkg.name) diff --git a/test/fixtures/users.yml b/test/fixtures/users.yml index d7fab89..6ca6461 100644 --- a/test/fixtures/users.yml +++ b/test/fixtures/users.yml @@ -5,7 +5,7 @@ admin: email: admin@debian.ork sign_in_count: 5 provider: local - admin: 1 + admin_role: true encrypted_password: <%= Devise::Encryptor.digest(User, 'adminsecret') %> normal: @@ -15,15 +15,13 @@ normal: email: mortal@debian.ork sign_in_count: 3 provider: local - admin: 0 encrypted_password: <%= Devise::Encryptor.digest(User, 'normalsecret') %> debian: name: Detlef Debian created_at: 2018-01-01 updated_at: 2018-01-01 - email: detlef@debian.ork + email: detlef@debian.org sign_in_count: 0 - provider: debian-sso - admin: 0 + provider: salsa encrypted_password: nil