Fixes zammad#4414 - Ticket selector allows for duplicate attributes w…

…ith expert mode switched off.
mlefrancois19 · Dec 5, 2022 · 3aedfb1 · 3aedfb1
1 parent 3685ff7
commit 3aedfb1
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/app/assets/javascripts/app/controllers/_ui_element/ticket_selector.coffee b/app/assets/javascripts/app/controllers/_ui_element/ticket_selector.coffee
@@ -777,4 +777,4 @@ class App.UiElement.ticket_selector extends App.UiElement.ApplicationSelector
     return App.Config.get('ticket_allow_expert_conditions')
 
   @hasDuplicateSelector: ->
-    return @hasExpertConditions()
+    return @hasExpertConditions() && @isExpertMode
diff --git a/spec/system/manage/overviews_expert_conditions_spec.rb b/spec/system/manage/overviews_expert_conditions_spec.rb
@@ -254,6 +254,19 @@
           end
         end
       end
+
+      it 'does not allow duplicate attributes when the expert mode is switched off (#4414)' do
+        scroll_into_view('.ticket_selector')
+
+        within '.ticket_selector' do
+          check_expert_mode(false)
+
+          # Check if the State attribute is disabled in the new dropdown.
+          find('.js-filterElement:nth-child(1) .js-add').click
+          attribute_selector = find('.js-filterElement:nth-child(2) .js-attributeSelector select')
+          expect(attribute_selector.find('option', text: 'State').disabled?).to be(true)
+        end
+      end
     end
 
     context 'with existing objects' do