From 0e8c663039dc2f643fa5cfcc669e1ecd87b61292 Mon Sep 17 00:00:00 2001 From: Sebastian Serth Date: Wed, 19 Dec 2018 01:29:42 +0100 Subject: [PATCH] Remove intervention controller, route and policy --- app/controllers/interventions_controller.rb | 55 --------------------- app/policies/intervention_policy.rb | 29 ----------- app/views/interventions/_form.html.slim | 6 --- app/views/interventions/index.html.slim | 15 ------ app/views/interventions/show.html.slim | 4 -- config/routes.rb | 8 --- 6 files changed, 117 deletions(-) delete mode 100644 app/controllers/interventions_controller.rb delete mode 100644 app/policies/intervention_policy.rb delete mode 100644 app/views/interventions/_form.html.slim delete mode 100644 app/views/interventions/index.html.slim delete mode 100644 app/views/interventions/show.html.slim diff --git a/app/controllers/interventions_controller.rb b/app/controllers/interventions_controller.rb deleted file mode 100644 index 27bfe4e0..00000000 --- a/app/controllers/interventions_controller.rb +++ /dev/null @@ -1,55 +0,0 @@ -class InterventionsController < ApplicationController - include CommonBehavior - - before_action :set_intervention, only: MEMBER_ACTIONS - - def authorize! - authorize(@intervention || @interventions) - end - private :authorize! - - def create - #@intervention = Intervention.new(intervention_params) - #authorize! - #create_and_respond(object: @intervention) - end - - def destroy - destroy_and_respond(object: @intervention) - end - - def edit - end - - def intervention_params - params[:intervention].permit(:name) if params[:intervention].present? - end - private :intervention_params - - def index - @interventions = Intervention.all.paginate(page: params[:page]) - authorize! - end - - def new - #@intervention = Intervention.new - #authorize! - end - - def set_intervention - @intervention = Intervention.find(params[:id]) - authorize! - end - private :set_intervention - - def show - end - - def update - update_and_respond(object: @intervention, params: intervention_params) - end - - def to_s - name - end -end diff --git a/app/policies/intervention_policy.rb b/app/policies/intervention_policy.rb deleted file mode 100644 index b8f482d5..00000000 --- a/app/policies/intervention_policy.rb +++ /dev/null @@ -1,29 +0,0 @@ -class InterventionPolicy < AdminOrAuthorPolicy - def batch_update? - admin? - end - - def show? - admin? || teacher? - end - - [:clone?, :destroy?, :edit?, :update?].each do |action| - define_method(action) { admin? || author?} - end - - def reload? - everyone - end - - class Scope < Scope - def resolve - if @user.admin? - @scope.all - elsif @user.teacher? - @scope.where('user_id = ? OR public = TRUE', @user.id) - else - @scope.none - end - end - end -end diff --git a/app/views/interventions/_form.html.slim b/app/views/interventions/_form.html.slim deleted file mode 100644 index 6ffe7397..00000000 --- a/app/views/interventions/_form.html.slim +++ /dev/null @@ -1,6 +0,0 @@ -= form_for(@intervention) do |f| - = render('shared/form_errors', object: @intervention) - .form-group - = f.label(:name) - = f.text_field(:name, class: 'form-control', required: true) - .actions = render('shared/submit_button', f: f, object: @intervention) diff --git a/app/views/interventions/index.html.slim b/app/views/interventions/index.html.slim deleted file mode 100644 index 92763567..00000000 --- a/app/views/interventions/index.html.slim +++ /dev/null @@ -1,15 +0,0 @@ -h1 = Intervention.model_name.human(count: 2) - -.table-responsive - table.table - thead - tr - th = t('activerecord.attributes.intervention.name') - th = t('shared.actions') - tbody - - @interventions.each do |intervention| - tr - td = link_to_if policy(intervention).show?, intervention.name - td = link_to(t('shared.show'), intervention) if policy(intervention).show? - -= render('shared/pagination', collection: @interventions) diff --git a/app/views/interventions/show.html.slim b/app/views/interventions/show.html.slim deleted file mode 100644 index f9202240..00000000 --- a/app/views/interventions/show.html.slim +++ /dev/null @@ -1,4 +0,0 @@ -h1 - = @intervention.name - -= row(label: 'intervention.name', value: @intervention.name) diff --git a/config/routes.rb b/config/routes.rb index d8a62acc..ed453762 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -115,14 +115,6 @@ Rails.application.routes.draw do end end - resources :interventions do - member do - post :clone - get :reload - post :submit - end - end - resources :external_users, only: [:index, :show], concerns: :statistics do resources :exercises, concerns: :statistics member do