From d5c036362be4cc893d9038cd18e088a32e346e56 Mon Sep 17 00:00:00 2001 From: Mathieu Magnin Date: Tue, 16 Jan 2018 17:09:25 +0100 Subject: [PATCH] Remove old controller and templates --- app/controllers/administrations_controller.rb | 15 -------- app/controllers/root_controller.rb | 2 +- app/views/administrations/_list.html.haml | 37 ------------------- app/views/administrations/index.html.haml | 15 -------- app/views/administrations/index.js.erb | 1 - app/views/layouts/_new_header.haml | 2 +- config/routes.rb | 4 -- .../omniauth_callbacks_controller_spec.rb | 2 +- .../administrations_controller_spec.rb | 21 ----------- spec/controllers/root_controller_spec.rb | 2 +- 10 files changed, 4 insertions(+), 97 deletions(-) delete mode 100644 app/controllers/administrations_controller.rb delete mode 100644 app/views/administrations/_list.html.haml delete mode 100644 app/views/administrations/index.html.haml delete mode 100644 app/views/administrations/index.js.erb delete mode 100644 spec/controllers/administrations_controller_spec.rb diff --git a/app/controllers/administrations_controller.rb b/app/controllers/administrations_controller.rb deleted file mode 100644 index 7f988dd4e..000000000 --- a/app/controllers/administrations_controller.rb +++ /dev/null @@ -1,15 +0,0 @@ -class AdministrationsController < ApplicationController - include SmartListing::Helper::ControllerExtensions - helper SmartListing::Helper - - before_action :authenticate_administration! - - def index - @admin = Administrateur.new - - @admins = smart_listing_create :admins, - Administrateur.all.order(:email), - partial: "administrations/list", - array: true - end -end diff --git a/app/controllers/root_controller.rb b/app/controllers/root_controller.rb index 7137999c5..aa78ee3d0 100644 --- a/app/controllers/root_controller.rb +++ b/app/controllers/root_controller.rb @@ -9,7 +9,7 @@ class RootController < ApplicationController elsif user_signed_in? return redirect_to users_dossiers_path elsif administration_signed_in? - return redirect_to administrations_path + return redirect_to manager_root_path end render 'landing' diff --git a/app/views/administrations/_list.html.haml b/app/views/administrations/_list.html.haml deleted file mode 100644 index e17abfa15..000000000 --- a/app/views/administrations/_list.html.haml +++ /dev/null @@ -1,37 +0,0 @@ -.card - - if smart_listing.present? - %table.table - %thead - %th.col-xs-4= smart_listing.sortable 'Email', :email - %th.col-xs-4= smart_listing.sortable 'Date de dernière connexion', :last_sign_in_at - %th.col-xs-2 État - %th.col-xs-2 Procédure active - %th.col-xs-2 Dossier en cours - - - @admins.each do |admin| - %tr - %td - = admin.email - %td - - if admin.last_sign_in_at.present? - = time_ago_in_words(l(admin.last_sign_in_at, format: "%d/%m/%Y %H:%M UTC +02:00")) - ( - = admin.last_sign_in_at.localtime.strftime('%d/%m/%Y') - ) - %td - - if admin.invitation_expired? - = link_to admin.registration_state, administration_path(admin), remote: true, method: :patch - - else - = admin.registration_state - %td - = admin.procedures.publiees.count - %td - - total_dossier = 0 - - admin.procedures.each do |procedure| total_dossier += procedure.dossiers.state_not_brouillon.count end - = total_dossier - = smart_listing.paginate - = smart_listing.pagination_per_page_links - - - else - %h4.center - Aucun administrateur créé diff --git a/app/views/administrations/index.html.haml b/app/views/administrations/index.html.haml deleted file mode 100644 index 730a7b487..000000000 --- a/app/views/administrations/index.html.haml +++ /dev/null @@ -1,15 +0,0 @@ -.container - .mt-1 - = form_for @admin, url: { controller: 'administrations', action: :create } do |f| - .form-group.form-inline.text-center - = f.text_field :email, placeholder: :email, class: 'form-control' - - = f.submit 'Créer un administrateur', class: 'btn btn-success', id: 'submit_new_administrateur' - - = smart_listing_render :admins - - %br - %br - - .text-center - = link_to 'Deconnexion', administrations_sign_out_path, method: :delete diff --git a/app/views/administrations/index.js.erb b/app/views/administrations/index.js.erb deleted file mode 100644 index a8a88c76e..000000000 --- a/app/views/administrations/index.js.erb +++ /dev/null @@ -1 +0,0 @@ -<%= smart_listing_update :admins %> diff --git a/app/views/layouts/_new_header.haml b/app/views/layouts/_new_header.haml index cd4a0f09c..f515c3238 100644 --- a/app/views/layouts/_new_header.haml +++ b/app/views/layouts/_new_header.haml @@ -45,7 +45,7 @@ = current_email - if administration_signed_in? %li - = link_to administrations_path, class: "menu-item menu-link" do + = link_to manager_root_path, class: "menu-item menu-link" do = image_tag "icons/super-admin.svg" Passer en super-admin - if SwitchDeviseProfileService.new(warden).multiple_devise_profile_connect? diff --git a/config/routes.rb b/config/routes.rb index 7b96c9ffe..817fd097d 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -58,10 +58,6 @@ Rails.application.routes.draw do get 'administrations/sign_in' => 'administrations/sessions#new' delete 'administrations/sign_out' => 'administrations/sessions#destroy' - authenticate :administration do - resources :administrations, only: [:index, :create, :update] do - end - end resources :stats, only: [:index] diff --git a/spec/controllers/administrations/omniauth_callbacks_controller_spec.rb b/spec/controllers/administrations/omniauth_callbacks_controller_spec.rb index dddc6439c..f98848006 100644 --- a/spec/controllers/administrations/omniauth_callbacks_controller_spec.rb +++ b/spec/controllers/administrations/omniauth_callbacks_controller_spec.rb @@ -18,7 +18,7 @@ describe Administrations::OmniauthCallbacksController, type: :controller do let(:administration) { create(:administration, email: email) } before { administration } - it { is_expected.to redirect_to(administrations_path) } + it { is_expected.to redirect_to(manager_administrateurs_path) } it do expect(controller).to receive(:sign_in).with(administration) subject diff --git a/spec/controllers/administrations_controller_spec.rb b/spec/controllers/administrations_controller_spec.rb deleted file mode 100644 index cb8435963..000000000 --- a/spec/controllers/administrations_controller_spec.rb +++ /dev/null @@ -1,21 +0,0 @@ -require 'spec_helper' - -describe AdministrationsController, type: :controller do - let(:administration) { create :administration } - - describe 'GET #index' do - subject { get :index } - - context 'when administration user is not connect' do - it { expect(subject.status).to eq 302 } - end - - context 'when administration user is connect' do - before do - sign_in administration - end - - it { expect(subject.status).to eq 200 } - end - end -end diff --git a/spec/controllers/root_controller_spec.rb b/spec/controllers/root_controller_spec.rb index 29538876b..7dc4aeae1 100644 --- a/spec/controllers/root_controller_spec.rb +++ b/spec/controllers/root_controller_spec.rb @@ -37,7 +37,7 @@ describe RootController, type: :controller do sign_in create(:administration) end - it { expect(subject).to redirect_to(administrations_path) } + it { expect(subject).to redirect_to(manager_root_path) } end context 'when nobody is connected' do