Merge pull request #4588 from tchak/clean-up-demarche-states

Clean up procedure states
This commit is contained in:
Paul Chavard 2019-11-28 14:45:24 +01:00 committed by GitHub
commit 39afa6659c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 1 additions and 25 deletions

View file

@ -22,16 +22,6 @@ module Manager
redirect_to manager_procedure_path(procedure)
end
def draft
if procedure.dossiers.empty?
procedure.draft!
flash[:notice] = "La démarche a bien été passée en brouillon."
else
flash[:alert] = "Impossible de repasser en brouillon une démarche à laquelle sont rattachés des dossiers."
end
redirect_to manager_procedure_path(procedure)
end
def hide
procedure.hide!
flash[:notice] = "La démarche a bien été supprimée, en cas d'erreur contactez un développeur."

View file

@ -1,7 +1,7 @@
require Rails.root.join('lib', 'percentile')
class Procedure < ApplicationRecord
self.ignored_columns = ['logo', 'logo_secure_token']
self.ignored_columns = ['logo', 'logo_secure_token', 'test_started_at']
include ProcedureStatsConcern
@ -112,10 +112,6 @@ class Procedure < ApplicationRecord
transitions from: :publiee, to: :hidden
transitions from: :archivee, to: :hidden
end
event :draft, after: :after_draft do
transitions from: :publiee, to: :brouillon
end
end
def publish_or_reopen!(administrateur)
@ -366,7 +362,6 @@ class Procedure < ApplicationRecord
}, &method(:clone_attachments))
procedure.path = SecureRandom.uuid
procedure.aasm_state = :brouillon
procedure.test_started_at = nil
procedure.archived_at = nil
procedure.published_at = nil
procedure.lien_notice = nil
@ -623,10 +618,6 @@ class Procedure < ApplicationRecord
purge_export_files
end
def after_draft
update!(published_at: nil)
end
def update_juridique_required
self.juridique_required ||= (cadre_juridique.present? || deliberation.attached?)
true

View file

@ -39,10 +39,6 @@ as well as a link to its edit page.
<%= link_to 'whitelister', whitelist_manager_procedure_path(procedure), method: :post, class: 'button' %>
<% end %>
<% if procedure.publiee? && procedure.dossiers.empty? %>
<%= link_to 'repasser en test', draft_manager_procedure_path(procedure), method: :post, class: 'button' %>
<% end %>
<% if !procedure.hidden? %>
<%= link_to 'supprimer la démarche', hide_manager_procedure_path(procedure), method: :post, class: 'button', data: { confirm: "Confirmez-vous la suppression de la démarche ?" } %>
<% end %>

View file

@ -514,7 +514,6 @@ describe Procedure do
it 'Not published nor archived' do
expect(subject.archived_at).to be_nil
expect(subject.published_at).to be_nil
expect(subject.test_started_at).to be_nil
expect(subject.aasm_state).to eq "brouillon"
expect(subject.path).not_to be_nil
end