Merge pull request #3514 from betagouv/dev

2019-02-26-02

app/assets/stylesheets/switch_menu.scss

@@ -1,16 +1,6 @@
 #switch-menu {
   position: fixed;
+  left: 10px;
   bottom: 10px;
-  color: #FFFFFF;
+  z-index: 300;
-  list-style: none;
-  text-decoration: none;
-  padding-left: 20px;
-}
-
-#switch-menu a,
-#switch-menu a:link,
-#switch-menu a:visited,
-#switch-menu a:hover {
-  text-decoration: none;
-  color: #FFFFFF;
 }

app/controllers/admin/procedures_controller.rb

@@ -67,7 +67,7 @@ class Admin::ProceduresController < AdminController
   end
 
   def create
-    @procedure = current_administrateur.admin_procedures.build(procedure_params)
+    @procedure = Procedure.new(procedure_params.merge(administrateurs: [current_administrateur]))
     @path = @procedure.path
     @availability = Procedure.path_availability(current_administrateur, @procedure.path)
 

app/views/layouts/_switch_devise_profile_module.html.haml

@@ -1,14 +1,25 @@
 - if SwitchDeviseProfileService.new(warden).multiple_devise_profile_connect?
-  %ul#switch-menu
+  #switch-menu.dropdown.dropup
-    %li
+    %button.btn.btn-default.dropdown-toggle{ type: :button, 'data-toggle' => 'dropdown', 'aria-haspopup' => true, 'aria-expanded' => false }
-      Changer de rôle
+      %i.fa.fa-toggle-on
+      %span.caret
+    %ul.dropdown-menu.dropdown-menu-left
       - if user_signed_in?
         %li
-        = link_to(dossiers_path, id: :menu_item_procedure, title: 'Aller dans votre espace usager. Vous pourrez revenir ici ensuite') do
+          = link_to(dossiers_path, id: :menu_item_procedure) do
-          %i.fa.fa-users
+            %i.fa.fa-user
-            Usager
+             
+            Usager
       - if gestionnaire_signed_in?
         %li
-        = link_to(gestionnaire_procedures_path, title: 'Aller dans votre espace instructeur. Vous pourrez revenir ici ensuite.') do
+          = link_to(gestionnaire_procedures_path) do
             %i.fa.fa-user
-            Instructeur
+             
+            Instructeur
+
+      - if administrateur_signed_in?
+        %li
+          = link_to(admin_procedures_path) do
+            %i.fa.fa-user
+             
+            Administrateur

app/views/layouts/application_old.html.haml

@@ -48,4 +48,6 @@
       %h1
         %i.fa.fa-times{ style: 'position: fixed; top: 10; right: 30; color: white;' }
 
+    = render partial: 'layouts/switch_devise_profile_module'
+
     = render partial: 'layouts/footer', locals: { main_container_size: main_container_size }

app/views/layouts/left_panels/_left_panel_admin_procedurescontroller_index.html.haml

@@ -31,7 +31,6 @@
           = current_administrateur.procedures.archivees.count
 
   .split-hr-left
-  = render partial: 'layouts/switch_devise_profile_module'
 
 
 #infos-block

lib/tasks/deployment/20190226101524_add_procedure_administrateur_to_administrateurs.rake

@@ -13,6 +13,6 @@ namespace :after_party do
     end
 
     progress.finish
-    AfterParty::TaskRecord.create version: '20190214101524'
+    AfterParty::TaskRecord.create version: '20190226101524'
   end
 end

spec/controllers/admin/procedures_controller_spec.rb

@@ -197,6 +197,7 @@ describe Admin::ProceduresController, type: :controller do
           it { expect(subject.organisation).to eq(organisation) }
           it { expect(subject.direction).to eq(direction) }
           it { expect(subject.administrateur_id).to eq(admin.id) }
+          it { expect(subject.administrateurs).to eq([admin]) }
           it { expect(subject.duree_conservation_dossiers_dans_ds).to eq(duree_conservation_dossiers_dans_ds) }
           it { expect(subject.duree_conservation_dossiers_hors_ds).to eq(duree_conservation_dossiers_hors_ds) }
         end