From 2f146e998099a9fbde0069e452c5bf794be48b59 Mon Sep 17 00:00:00 2001 From: Nicolas Bally Date: Mon, 4 May 2020 21:15:27 +0200 Subject: [PATCH] suite --- app/controllers/admin/m_odr_files_controller.rb | 2 ++ app/views/admin/m_odr_files/_form.html.haml | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/app/controllers/admin/m_odr_files_controller.rb b/app/controllers/admin/m_odr_files_controller.rb index 27305a6..7ca2c86 100644 --- a/app/controllers/admin/m_odr_files_controller.rb +++ b/app/controllers/admin/m_odr_files_controller.rb @@ -73,6 +73,8 @@ class Admin::MOdrFilesController < ApplicationController if @m_odr_file.update_attributes(params.require(:m_odr_file).permit!) @m_odr_file.m_odr_rep.change_state("En cours de traitement") + + redirect_to [:admin, @m_odr_rep] else render action: "edit" diff --git a/app/views/admin/m_odr_files/_form.html.haml b/app/views/admin/m_odr_files/_form.html.haml index e0461b5..778503c 100644 --- a/app/views/admin/m_odr_files/_form.html.haml +++ b/app/views/admin/m_odr_files/_form.html.haml @@ -1,8 +1,10 @@ -=semantic_form_for [:admin, @m_odr_file], :remote => true do |f| +=semantic_form_for [:admin, @m_odr_file], :remote => false, :multipart => true do |f| -if current_admin.id == 1 =debug f.object.errors.messages .content =f.inputs do + = f.input :file, :label => "Fichier :" + = f.input :admin_ok, :label => "Décision :", :collection => [["Validé",true], ["Refusé", false]], :as => :select = f.input :reject_reason, :label => "Motif du rejet :", :collection => ["Mauvais document","Mauvaise qualité rendant le fichier illisible"]