Merge branch 'ce-6145-extract-app-views-shared-issuable-3' into 'master'
CE: Resolve 3 "Extract EE specific files/lines for app/views/shared/issuable" See merge request gitlab-org/gitlab-ce!19777
This commit is contained in:
commit
72770e609d
|
@ -50,7 +50,7 @@
|
||||||
- data[:multi_select] = true
|
- data[:multi_select] = true
|
||||||
- data['dropdown-title'] = title
|
- data['dropdown-title'] = title
|
||||||
- data['dropdown-header'] = dropdown_options[:data][:'dropdown-header']
|
- data['dropdown-header'] = dropdown_options[:data][:'dropdown-header']
|
||||||
- data['max-select'] = dropdown_options[:data][:'max-select']
|
- data['max-select'] = dropdown_options[:data][:'max-select'] if dropdown_options[:data][:'max-select']
|
||||||
- options[:data].merge!(data)
|
- options[:data].merge!(data)
|
||||||
|
|
||||||
= dropdown_tag(title, options: options)
|
= dropdown_tag(title, options: options)
|
||||||
|
|
|
@ -25,7 +25,10 @@
|
||||||
= form.hidden_field :label_ids, multiple: true, value: ''
|
= form.hidden_field :label_ids, multiple: true, value: ''
|
||||||
.col-sm-10{ class: "#{"col-md-8" if has_due_date} #{'issuable-form-padding-top' if !has_labels}" }
|
.col-sm-10{ class: "#{"col-md-8" if has_due_date} #{'issuable-form-padding-top' if !has_labels}" }
|
||||||
.issuable-form-select-holder
|
.issuable-form-select-holder
|
||||||
= render "shared/issuable/label_dropdown", classes: ["js-issuable-form-dropdown"], selected: issuable.labels, data_options: { field_name: "#{issuable.class.model_name.param_key}[label_ids][]", show_any: false}, dropdown_title: "Select label"
|
= render "shared/issuable/label_dropdown", classes: ["js-issuable-form-dropdown"], selected: issuable.labels, data_options: { field_name: "#{issuable.class.model_name.param_key}[label_ids][]", show_any: false }, dropdown_title: "Select label"
|
||||||
|
|
||||||
|
= render_if_exists "shared/issuable/form/weight", issuable: issuable, form: form
|
||||||
|
|
||||||
- if has_due_date
|
- if has_due_date
|
||||||
.col-lg-6
|
.col-lg-6
|
||||||
.form-group.row
|
.form-group.row
|
||||||
|
|
Loading…
Reference in New Issue