Merge pull request #8943 from tchak/fix-dossier-can-create-new-dossiers
ETQ usager, je peux créer de nouveaux dossiers sur la démarche qui remplace la démarche fermée
This commit is contained in:
commit
2775158052
3 changed files with 10 additions and 1 deletions
|
@ -453,6 +453,10 @@ class Procedure < ApplicationRecord
|
||||||
publiee? || brouillon?
|
publiee? || brouillon?
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def replaced_by_procedure?
|
||||||
|
replaced_by_procedure_id.present?
|
||||||
|
end
|
||||||
|
|
||||||
def dossier_can_transition_to_en_construction?
|
def dossier_can_transition_to_en_construction?
|
||||||
accepts_new_dossiers? || depubliee?
|
accepts_new_dossiers? || depubliee?
|
||||||
end
|
end
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
- has_edit_action = !dossier.read_only?
|
- has_edit_action = !dossier.read_only?
|
||||||
- has_delete_action = dossier.can_be_deleted_by_user?
|
- has_delete_action = dossier.can_be_deleted_by_user?
|
||||||
- has_new_dossier_action = dossier.procedure.accepts_new_dossiers?
|
- has_new_dossier_action = dossier.procedure.accepts_new_dossiers? || dossier.procedure.replaced_by_procedure?
|
||||||
- has_transfer_action = dossier.user == current_user
|
- has_transfer_action = dossier.user == current_user
|
||||||
- has_actions = has_edit_action || has_delete_action || has_new_dossier_action || has_transfer_action
|
- has_actions = has_edit_action || has_delete_action || has_new_dossier_action || has_transfer_action
|
||||||
|
|
||||||
|
|
|
@ -18,4 +18,9 @@ describe 'users/dossiers/dossier_actions.html.haml', type: :view do
|
||||||
let(:procedure) { create(:procedure, :closed) }
|
let(:procedure) { create(:procedure, :closed) }
|
||||||
it { is_expected.not_to have_link('Commencer un autre dossier') }
|
it { is_expected.not_to have_link('Commencer un autre dossier') }
|
||||||
end
|
end
|
||||||
|
|
||||||
|
context 'when the procedure is closed and replaced' do
|
||||||
|
let(:procedure) { create(:procedure, :closed, replaced_by_procedure: create(:procedure)) }
|
||||||
|
it { is_expected.to have_link('Commencer un autre dossier') }
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
Loading…
Add table
Reference in a new issue