Merge pull request #1328 from stanleylhs/fix-opportunities-campaign-a…

…utocomplete Fix Opportunities Campaign selection auto complete
fatfreecrm · Aug 23, 2024 · 5d198d9 · 5d198d9
2 parents d28e1fd + 868e442
commit 5d198d9
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/app/helpers/opportunities_helper.rb b/app/helpers/opportunities_helper.rb
@@ -41,8 +41,10 @@ def opportunity_campaign_select(options = {})
     selected_campaign = Campaign.find_by_id(options[:selected])
     campaigns = ([selected_campaign] + Campaign.my(current_user).order(:name).limit(25)).compact.uniq
     collection_select :opportunity, :campaign_id, campaigns, :id, :name,
-                      { selected: options[:selected], prompt: t(:select_a_campaign) },
-                      style: 'width:330px;', class: 'select2'
+                      { selected: options[:selected], prompt: t(:select_a_campaign), include_blank: true },
+                      style: 'width:330px;', class: 'select2',
+                      placeholder: t(:select_a_campaign),
+                      "data-url": auto_complete_campaigns_path(format: 'json')
   end
 
   # Generates the inline revenue message for the opportunity list table.

diff --git a/app/helpers/users_helper.rb b/app/helpers/users_helper.rb
@@ -25,7 +25,7 @@ def user_select(asset, users, myself)
     user_options = user_options_for_select(users, myself)
     select(asset, :assigned_to, user_options,
            { include_blank: t(:unassigned) },
-           style: 'width: 160px;',
+           style: 'width: 160px;', "data-allow-clear" => false,
            class: 'select2')
   end