diff options
| author | Alban Peignier | 2018-01-11 12:02:49 +0100 |
|---|---|---|
| committer | Alban Peignier | 2018-01-11 12:30:43 +0100 |
| commit | 1050db0cbdec3f2fa5733d8e9cb2211de115b78e (patch) | |
| tree | dd1879b2e4638da3588b6b3aa3716c0ebba9cc95 | |
| parent | 4f74779e9732c5dd45bd8c3cd1ae67f74d1faa28 (diff) | |
| download | chouette-core-1050db0cbdec3f2fa5733d8e9cb2211de115b78e.tar.bz2 | |
Define Merge Referential name. Refs #5299
| -rw-r--r-- | app/models/merge.rb | 4 | ||||
| -rw-r--r-- | config/locales/merges.yml | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/app/models/merge.rb b/app/models/merge.rb index cef675101..26bd5398b 100644 --- a/app/models/merge.rb +++ b/app/models/merge.rb @@ -55,14 +55,14 @@ class Merge < ActiveRecord::Base attributes = { workbench: workbench, organisation: workbench.organisation, # TODO could be workbench.organisation by default - name: I18n.t("merges.referential_name"), } workbench.output.referentials.new attributes end new.referential_suite = output new.organisation = workbench.organisation - new.slug = "output_#{workbench.id}_#{Time.now.to_i}" + new.slug = "output_#{workbench.id}_#{created_at.to_i}" + new.name = I18n.t("merges.referential_name", date: I18n.l(created_at)) unless new.valid? Rails.logger.error "New referential isn't valid : #{new.errors.inspect}" diff --git a/config/locales/merges.yml b/config/locales/merges.yml index 00af5f65d..d8511a7b4 100644 --- a/config/locales/merges.yml +++ b/config/locales/merges.yml @@ -1,5 +1,6 @@ fr: merges: + referential_name: "Offre finalisée %{date}" index: title: "Finalisations de l'offre" new: |