parent
fdb703d790
commit
ed517c5ab7
|
@ -264,14 +264,23 @@ class GitLabDropdown
|
||||||
rowClicked: (el) ->
|
rowClicked: (el) ->
|
||||||
fieldName = @options.fieldName
|
fieldName = @options.fieldName
|
||||||
field = @dropdown.parent().find("input[name='#{fieldName}']")
|
field = @dropdown.parent().find("input[name='#{fieldName}']")
|
||||||
|
selectedIndex = el.parent().index()
|
||||||
|
if @renderedData
|
||||||
|
selectedObject = @renderedData[selectedIndex]
|
||||||
|
value = if @options.id then @options.id(selectedObject, el) else selectedObject.id
|
||||||
|
field = @dropdown.parent().find("input[name='#{fieldName}'][value='#{value}']")
|
||||||
|
|
||||||
if el.hasClass(ACTIVE_CLASS)
|
if el.hasClass(ACTIVE_CLASS)
|
||||||
field.remove()
|
if @options.multiSelect
|
||||||
|
console.log field.val(), value
|
||||||
|
else
|
||||||
|
field.remove()
|
||||||
else
|
else
|
||||||
fieldName = @options.fieldName
|
fieldName = @options.fieldName
|
||||||
selectedIndex = el.parent().index()
|
selectedIndex = el.parent().index()
|
||||||
if @renderedData
|
if @renderedData
|
||||||
selectedObject = @renderedData[selectedIndex]
|
selectedObject = @renderedData[selectedIndex]
|
||||||
|
selectedObject.selected = true
|
||||||
value = if @options.id then @options.id(selectedObject, el) else selectedObject.id
|
value = if @options.id then @options.id(selectedObject, el) else selectedObject.id
|
||||||
|
|
||||||
if !value?
|
if !value?
|
||||||
|
|
|
@ -85,8 +85,9 @@
|
||||||
- else
|
- else
|
||||||
.light None
|
.light None
|
||||||
.selectbox.hide-collapsed
|
.selectbox.hide-collapsed
|
||||||
|
= f.hidden_field 'label_name', value: issuable.labels.map(&:id).join(',')
|
||||||
.dropdown
|
.dropdown
|
||||||
%button.dropdown-menu-toggle.js-label-select.js-multiselect{type: "button", data: {toggle: "dropdown", field_name: "label_name", show_no: "true", show_any: "true", selected: issuable.label_names.join(","), project_id: (@project.id if @project), issue_update: namespace_project_issue_path(@project.namespace, @project, issuable.id, :json), labels: (namespace_project_labels_path(@project.namespace, @project, :json) if @project)}}
|
%button.dropdown-menu-toggle.js-label-select.js-multiselect{type: "button", data: {toggle: "dropdown", field_name: "issue[label_name]", show_no: "true", show_any: "true", selected: issuable.label_names.join(","), project_id: (@project.id if @project), issue_update: namespace_project_issue_path(@project.namespace, @project, issuable.id, :json), labels: (namespace_project_labels_path(@project.namespace, @project, :json) if @project)}}
|
||||||
%span.dropdown-toggle-text
|
%span.dropdown-toggle-text
|
||||||
Label
|
Label
|
||||||
= icon('chevron-down')
|
= icon('chevron-down')
|
||||||
|
|
Loading…
Reference in New Issue