DGNum/demarches-normaliennes
13
1
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity

controller

Browse source
This commit is contained in:
Kara Diaby 2022-06-02 15:26:04 +02:00
parent 60eed4ec01
commit d2bd2ffcbe
2 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
app/controllers/administrateurs/procedures_controller.rb
View file

@ -233,17 +233,19 @@ module Administrateurs
@procedure.assign_attributes(publish_params) @procedure.assign_attributes(publish_params)
if @procedure.draft_changed? if @procedure.draft_changed? && !@procedure.close?
@procedure.publish_revision! @procedure.publish_revision!
flash.notice = "Nouvelle version de la démarche publiée" flash.notice = "Nouvelle version de la démarche publiée"
redirect_to admin_procedure_path(@procedure) elsif @procedure.draft_changed? && @procedure.close?
@procedure.publish_or_reopen!(current_administrateur)
@procedure.publish_revision!
flash.notice = "Démarche publiée"
elsif @procedure.publish_or_reopen!(current_administrateur) elsif @procedure.publish_or_reopen!(current_administrateur)
flash.notice = "Démarche publiée" flash.notice = "Démarche publiée"
redirect_to admin_procedure_path(@procedure)
else else
flash.alert = @procedure.errors.full_messages flash.alert = @procedure.errors.full_messages
redirect_to admin_procedure_path(@procedure)
end end
redirect_to admin_procedure_path(@procedure)
end end
def transfert def transfert

2
app/models/procedure.rb
View file

@ -405,7 +405,7 @@ class Procedure < ApplicationRecord
end end
def draft_changed? def draft_changed?
published_revision.different_from?(draft_revision) && revision_changes.present? !brouillon? && published_revision.different_from?(draft_revision) && revision_changes.present?
end end
def revision_changes def revision_changes