Merge branch 'main' into create-obs-location

MushroomObserver · Jun 19, 2024 · 33d08fc · 33d08fc
2 parents 046d888 + bc2ed6f
commit 33d08fc
Show file tree

Hide file tree

Showing 5 changed files with 140 additions and 146 deletions.
diff --git a/app/helpers/namings_helper.rb b/app/helpers/namings_helper.rb
@@ -256,9 +256,12 @@ def your_vote_html(naming, vote)
   def naming_vote_form(naming, vote, context: "blank")
     vote_id = vote&.id
     method = vote_id ? :patch : :post
-    menu = Vote.confidence_menu
     can_vote = check_permission(naming)
-    menu = [Vote.no_opinion] + menu if !can_vote || !vote || vote&.value&.zero?
+    menu = if !can_vote || !vote || vote&.value&.zero?
+             Vote.opinion_menu
+           else
+             Vote.confidence_menu
+           end
     localizations = {
       lose_changes: :show_namings_lose_changes.l.tr("\n", " "),
       saving: :show_namings_saving.l