replace camelcase variables with snakecase for haml and ruby26245-fixes-no-label-not-stay-selected

2 files changed, 6 insertions, 6 deletions

diff --git a/app/helpers/issuables_helper.rb b/app/helpers/issuables_helper.rb
index 1524c982725..0c394d81374 100644
--- a/app/helpers/issuables_helper.rb
+++ b/app/helpers/issuables_helper.rb
@@ -7,8 +7,8 @@ module IssuablesHelper
     "right-sidebar-#{sidebar_gutter_collapsed? ? 'collapsed' : 'expanded'}"
   end
 
-  def multi_label_name(current_labels, default_label, hasNoLabel = false)
-    if hasNoLabel
+  def multi_label_name(current_labels, default_label, has_no_label = false)
+    if has_no_label
       return Label::None.title
     end
 
diff --git a/app/views/shared/issuable/_label_dropdown.html.haml b/app/views/shared/issuable/_label_dropdown.html.haml
index 2b7a66cbbb3..c414867d215 100644
--- a/app/views/shared/issuable/_label_dropdown.html.haml
+++ b/app/views/shared/issuable/_label_dropdown.html.haml
@@ -8,21 +8,21 @@
 - classes = local_assigns.fetch(:classes, [])
 - selected = local_assigns.fetch(:selected, nil)
 - selected_toggle = local_assigns.fetch(:selected_toggle, nil)
-- hasNoLabel = selected_toggle && selected_toggle.include?('No Label')
+- has_no_label = selected_toggle && selected_toggle.include?('No Label')
 - dropdown_title = local_assigns.fetch(:dropdown_title, "Filter by label")
 - dropdown_data = {toggle: 'dropdown', field_name: "label_name[]", show_no: "true", show_any: "true", namespace_path: @project.try(:namespace).try(:path), project_path: @project.try(:path), labels: labels_filter_path, default_label: "Labels"}
 - dropdown_data.merge!(data_options)
 - classes << 'js-extra-options' if extra_options
 - classes << 'js-filter-submit' if filter_submit
 
-- if selected && !hasNoLabel
+- if selected && !has_no_label
   - selected.each do |label|
     = hidden_field_tag data_options[:field_name], use_id ? label.try(:id) : label.try(:title), id: nil
 
 .dropdown
   %button.dropdown-menu-toggle.js-label-select.js-multiselect{ class: classes.join(' '), type: "button", data: dropdown_data }
-    %span.dropdown-toggle-text{ class: ("is-default" if (selected.nil? || selected.empty?) && !hasNoLabel) }
-      = multi_label_name(selected, "Labels", hasNoLabel)
+    %span.dropdown-toggle-text{ class: ("is-default" if !has_no_label && (selected.nil? || selected.empty?)) }
+      = multi_label_name(selected, "Labels", has_no_label)
     = icon('chevron-down')
   .dropdown-menu.dropdown-select.dropdown-menu-paging.dropdown-menu-labels.dropdown-menu-selectable
     = render partial: "shared/issuable/label_page_default", locals: { title: dropdown_title, show_footer: show_footer, show_create: show_create }