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

Read from path attribute instead of procedure_path when possible

Browse source
This commit is contained in:
Paul Chavard 2018-09-13 18:33:35 +02:00
parent 2787f040af
commit b772256a97
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/helpers/procedure_helper.rb
View file

@ -1,6 +1,6 @@
module ProcedureHelper module ProcedureHelper
def procedure_lien(procedure) def procedure_lien(procedure)
if procedure.procedure_path.present? if procedure.path.present?
if procedure.brouillon_avec_lien? if procedure.brouillon_avec_lien?
commencer_test_url(procedure_path: procedure.path) commencer_test_url(procedure_path: procedure.path)
else else

4
app/models/procedure.rb
View file

@ -131,7 +131,7 @@ class Procedure < ApplicationRecord
# This method is needed for transition. Eventually this will be the same as brouillon?. # This method is needed for transition. Eventually this will be the same as brouillon?.
def brouillon_avec_lien? def brouillon_avec_lien?
Flipflop.publish_draft? && brouillon? && procedure_path.present? Flipflop.publish_draft? && brouillon? && path.present?
end end
def publiee_ou_archivee? def publiee_ou_archivee?
@ -250,7 +250,7 @@ class Procedure < ApplicationRecord
end end
def export_filename def export_filename
procedure_identifier = procedure_path&.path || "procedure-#{id}" procedure_identifier = path || "procedure-#{id}"
"dossiers_#{procedure_identifier}_#{Time.now.strftime('%Y-%m-%d_%H-%M')}" "dossiers_#{procedure_identifier}_#{Time.now.strftime('%Y-%m-%d_%H-%M')}"
end end