Merge pull request #564 from fatfreecrm/upgrade_select2

Fix 'Uncaught Error: No select2/compat/inputData'
fatfreecrm · Feb 17, 2017 · 1b305e0 · 1b305e0
2 parents 5bf13b1 + c5b1ccb
commit 1b305e0
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 7 deletions.
diff --git a/app/assets/javascripts/application.js.erb b/app/assets/javascripts/application.js.erb
@@ -8,7 +8,7 @@
 //= require jquery-migrate
 //= require jquery_ujs
 //= require jquery-ui
-//= require select2
+//= require select2-full
 //= require crm
 //= require crm_classes
 //= require crm_loginout

diff --git a/app/assets/javascripts/crm_select2.js.coffee b/app/assets/javascripts/crm_select2.js.coffee
@@ -18,7 +18,6 @@
     #$(".select2_tag").each ->
       $(this).select2
         'width':'resolve'
-        tags: $(this).data("tags")
         placeholder: $(this).data("placeholder")
         multiple: $(this).data("multiple")
 

diff --git a/app/views/shared/_tags.html.haml b/app/views/shared/_tags.html.haml
@@ -3,8 +3,4 @@
   %td{ :valign => :top, :colspan => span }
     .label= t(:tags) + ":"
 
-    = f.hidden_field :tag_list,
-    {:class => "select2_tag", :data => {:tags => Tag.all.map{|t| t.name},
-    :url => url_for(action: 'field_group'), :placeholder => t(:select_or_create_tags),
-    :multiple => true, :asset_id => f.object.try(:id),
-    }, value: f.object.tag_list.join(",")}
+    = f.select :tag_list, Tag.all.map{|t| t.name}, {}, {:class => "select2_tag", :data => {:tags => true, :url => url_for(action: 'field_group'), :placeholder => t(:select_or_create_tags), :multiple => true, :asset_id => f.object.try(:id)}, :multiple => true}