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

Allow publishing revisions when feature flag is enabled

Browse source
This commit is contained in:
Paul Chavard 2021-04-28 15:08:48 +02:00
parent 9d3416af53
commit e68441d573
3 changed files with 15 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
app/controllers/new_administrateur/administrateur_controller.rb
View file

@ -19,6 +19,13 @@ module NewAdministrateur
end end
end end
def procedure_revisable?
if @procedure.locked? && !@procedure.feature_enabled?(:procedure_revisions)
flash.alert = 'Démarche verrouillée'
redirect_to admin_procedure_path(@procedure)
end
end
def reset_procedure def reset_procedure
if @procedure.brouillon? if @procedure.brouillon?
@procedure.reset! @procedure.reset!

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

@ -1,7 +1,7 @@
module NewAdministrateur module NewAdministrateur
class ProceduresController < AdministrateurController class ProceduresController < AdministrateurController
before_action :retrieve_procedure, only: [:champs, :annotations, :edit, :monavis, :update_monavis, :jeton, :update_jeton, :publication, :publish, :transfert, :allow_expert_review, :experts_require_administrateur_invitation] before_action :retrieve_procedure, only: [:champs, :annotations, :edit, :monavis, :update_monavis, :jeton, :update_jeton, :publication, :publish, :transfert, :allow_expert_review, :experts_require_administrateur_invitation]
before_action :procedure_locked?, only: [:champs, :annotations] before_action :procedure_revisable?, only: [:champs, :annotations]
ITEMS_PER_PAGE = 25 ITEMS_PER_PAGE = 25
@ -154,12 +154,16 @@ module NewAdministrateur
def publish def publish
@procedure.assign_attributes(publish_params) @procedure.assign_attributes(publish_params)
if @procedure.publish_or_reopen!(current_administrateur) if @procedure.draft_changed?
@procedure.publish_revision!
flash.notice = "Nouvelle version de la démarche publiée"
redirect_to admin_procedure_path(@procedure) redirect_to admin_procedure_path(@procedure)
elsif @procedure.publish_or_reopen!(current_administrateur)
flash.notice = "Démarche publiée" flash.notice = "Démarche publiée"
else
redirect_to admin_procedure_path(@procedure) redirect_to admin_procedure_path(@procedure)
else
flash.alert = @procedure.errors.full_messages flash.alert = @procedure.errors.full_messages
redirect_to admin_procedure_path(@procedure)
end end
end end

2
app/controllers/new_administrateur/types_de_champ_controller.rb
View file

@ -1,7 +1,7 @@
module NewAdministrateur module NewAdministrateur
class TypesDeChampController < AdministrateurController class TypesDeChampController < AdministrateurController
before_action :retrieve_procedure, only: [:create, :update, :move, :destroy] before_action :retrieve_procedure, only: [:create, :update, :move, :destroy]
before_action :procedure_locked?, only: [:create, :update, :move, :destroy] before_action :procedure_revisable?, only: [:create, :update, :move, :destroy]
def create def create
type_de_champ = @procedure.draft_revision.add_type_de_champ(type_de_champ_create_params) type_de_champ = @procedure.draft_revision.add_type_de_champ(type_de_champ_create_params)