Fixes for multi selection
This commit is contained in:
@@ -24,13 +24,11 @@ export default class extends Controller {
|
||||
|
||||
get #selectedLabel() {
|
||||
const selectedValue = this.#selectedItemValue()
|
||||
console.debug("Es ", this.defaultValueValue);
|
||||
|
||||
if (this.hasDefaultLabelValue && (selectedValue === this.defaultValueValue || !selectedValue)) {
|
||||
return this.defaultLabelValue
|
||||
}
|
||||
|
||||
console.debug("EIN", this.#selectedItem);
|
||||
|
||||
return this.#selectedItem?.dataset?.comboboxLabel || ""
|
||||
}
|
||||
|
||||
|
||||
@@ -26,11 +26,12 @@ export default class extends Controller {
|
||||
if (!value) return false
|
||||
|
||||
const defaultValue = this.#defaultValueForField(field)
|
||||
console.debug("defaultValue", defaultValue);
|
||||
return defaultValue ? value !== defaultValue : true
|
||||
}
|
||||
|
||||
#defaultValueForField(field) {
|
||||
const comboboxContainer = field.closest("[data-combobox-default-value]")
|
||||
return comboboxContainer?.dataset?.comboboxDefaultValue
|
||||
const comboboxContainer = field.closest("[data-combobox-default-value-value]")
|
||||
return comboboxContainer?.dataset?.comboboxDefaultValueValue
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
<% filter = user_filtering.filter %>
|
||||
<%= tag.div class: "quick-filter position-relative",
|
||||
data: {
|
||||
controller: "dialog multi-selection-combobox form",
|
||||
controller: "dialog multi-selection-combobox",
|
||||
action: "keydown.esc->dialog#close click@document->dialog#closeOnClickOutside",
|
||||
filter_show: user_filtering.show_assignees?,
|
||||
multi_selection_combobox_no_selection_label_value: "Assigned to…" } do %>
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
<%= tag.div class: "quick-filter position-relative",
|
||||
data: {
|
||||
controller: "dialog multi-selection-combobox form",
|
||||
controller: "dialog multi-selection-combobox",
|
||||
action: "keydown.esc->dialog#close click@document->dialog#closeOnClickOutside",
|
||||
filter_show: user_filtering.show_closers?,
|
||||
multi_selection_combobox_no_selection_label_value: "Closed by…" } do %>
|
||||
|
||||
@@ -3,8 +3,8 @@
|
||||
<%= hidden_field_tag :expand_all, true, disabled: !user_filtering.expanded?, data: { toggle_enable_target: "element" } %>
|
||||
<%= render "filters/settings/sorted_by", user_filtering: user_filtering %>
|
||||
<%= render "filters/settings/indexed_by", user_filtering: user_filtering %>
|
||||
<%#= render "filters/settings/tags", user_filtering: user_filtering %>
|
||||
<%#= render "filters/settings/assignees", user_filtering: user_filtering %>
|
||||
<%#= render "filters/settings/creators", user_filtering: user_filtering %>
|
||||
<%#= render "filters/settings/closers", user_filtering: user_filtering %>
|
||||
<%= render "filters/settings/tags", user_filtering: user_filtering %>
|
||||
<%= render "filters/settings/assignees", user_filtering: user_filtering %>
|
||||
<%= render "filters/settings/creators", user_filtering: user_filtering %>
|
||||
<%= render "filters/settings/closers", user_filtering: user_filtering %>
|
||||
<% end %>
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
<%= tag.div class: "quick-filter position-relative",
|
||||
data: {
|
||||
controller: "dialog multi-selection-combobox form",
|
||||
controller: "dialog multi-selection-combobox",
|
||||
action: "keydown.esc->dialog#close click@document->dialog#closeOnClickOutside",
|
||||
filter_show: user_filtering.show_creators?,
|
||||
multi_selection_combobox_no_selection_label_value: "Added by…" } do %>
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
<% filter = user_filtering.filter %>
|
||||
|
||||
<%= tag.div class: class_names("quick-filter position-relative"),
|
||||
data: { controller: "dialog combobox form",
|
||||
data: { controller: "dialog combobox",
|
||||
action: "keydown.esc->dialog#close click@document->dialog#closeOnClickOutside",
|
||||
filter_show: user_filtering.show_indexed_by?,
|
||||
turbo_action: "advance",
|
||||
|
||||
Reference in New Issue
Block a user