diff options
| author | Alban Peignier | 2018-01-10 14:57:52 +0100 |
|---|---|---|
| committer | Alban Peignier | 2018-01-10 14:57:52 +0100 |
| commit | 4ddd8011922530c4e756dca50c165fc87a7f439b (patch) | |
| tree | 15a2dc45ac002c5d2970c5c222a9c28f563b313e /app | |
| parent | 23d91f87304af8c9e94fc75ce42fe2195aa0fc59 (diff) | |
| download | chouette-core-4ddd8011922530c4e756dca50c165fc87a7f439b.tar.bz2 | |
Define and display Merge#creator. Refs #5299
Diffstat (limited to 'app')
| -rw-r--r-- | app/controllers/merges_controller.rb | 6 | ||||
| -rw-r--r-- | app/views/merges/_form.html.slim | 5 |
2 files changed, 11 insertions, 0 deletions
diff --git a/app/controllers/merges_controller.rb b/app/controllers/merges_controller.rb index 26e2c2e3c..a95768139 100644 --- a/app/controllers/merges_controller.rb +++ b/app/controllers/merges_controller.rb @@ -15,6 +15,12 @@ class MergesController < ChouetteController Rails.logger.debug "Mergeables: #{@mergeable_referentials.inspect}" end + def build_resource + super.tap do |merge| + merge.creator = current_user.name + end + end + # def build_resource # @import ||= WorkbenchImport.new(*resource_params) do |import| # import.workbench = parent diff --git a/app/views/merges/_form.html.slim b/app/views/merges/_form.html.slim index ff85ad76b..b97a4b03e 100644 --- a/app/views/merges/_form.html.slim +++ b/app/views/merges/_form.html.slim @@ -4,4 +4,9 @@ .col-lg-12 = form.input :referentials, :collection => @mergeable_referentials, include_blank: false, input_html: { multiple: true, 'data-select2ed': true } + + .row + .col-lg-12 + = form.input :creator, input_html: { disabled: true } + = form.button :submit, t('actions.submit'), class: 'btn btn-default formSubmitr', form: 'wb_merge_form' |