Merging from main master to my repo master. #4

Closed
Karavel wants to merge 53 commits from fixin.me/fixin.me:master into master
3 changed files with 29 additions and 7 deletions
Showing only changes of commit 817b1a4376 - Show all commits

View File

@ -1,11 +1,30 @@
class Default::UnitsController < ApplicationController
navigation_tab :units
before_action :find_unit, only: [:import, :export, :destroy]
before_action except: :index do
raise AccessForbidden unless current_user.at_least(:admin)
case action_name.to_sym
when :import, :import_all
raise AccessForbidden unless current_user.at_least(:active)
else
raise AccessForbidden unless current_user.at_least(:admin)
end
end
def index
@units = current_user.units.defaults_diff
end
def import
end
def import_all
end
def export
end
def destroy
end
end

View File

@ -1,5 +1,5 @@
class UnitsController < ApplicationController
before_action only: [:new] do
before_action only: :new do
find_unit if params[:id].present?
end
before_action :find_unit, only: [:edit, :update, :rebase, :destroy]

View File

@ -2,11 +2,14 @@ class UsersController < ApplicationController
helper_method :allow_disguise?
before_action :find_user, only: [:show, :update, :disguise]
before_action except: :revert do
raise AccessForbidden unless current_user.at_least(:admin)
end
before_action only: :revert do
raise AccessForbidden unless current_user_disguised?
before_action do
case action_name.to_sym
when :revert
raise AccessForbidden unless current_user_disguised?
else
raise AccessForbidden unless current_user.at_least(:admin)
end
end
def index