fixes link_to_inline method and chosen selects

fatfreecrm · Jan 9, 2014 · d51bed7 · d51bed7
1 parent db637f5
commit d51bed7
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 11 deletions.
diff --git a/app/assets/javascripts/crm_chosen.js.coffee b/app/assets/javascripts/crm_chosen.js.coffee
@@ -7,23 +7,23 @@
 
   # Initialize chosen for multiselect tag list
   crm.chosen_taglist = (asset, controller, id)->
-    new Chosen $('#' + asset + '_tag_list'), {
+    $('#' + asset + '_tag_list').chosen(
       allow_option_creation: true
       on_option_add: (tag) ->
         crm.load_field_group(controller, tag, id)
       on_option_remove: (tag) ->
         crm.remove_field_group(tag)
-    }
+    )
 
   crm.ensure_chosen_account = ->
     unless $("#account_id_chzn")
-      new ajaxChosen $("#account_id"), {
+      $("#account_id").ajaxChosen(
         allow_single_deselect: true
         show_on_activate: true
         url: "/accounts/auto_complete.json"
         parameters: { limit: 25 }
         query_key: "auto_complete_query"
-      }
+      )
 
   # Prefer standard select2 dropdown for non-Ajaxy selectboxes
   add_select2_boxes = ->

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
@@ -91,7 +91,7 @@ def link_to_inline(id, url, options = {})
     link_to(text,
       url + "#{url.include?('?') ? '&' : '?'}cancel=false" + related,
       :remote => true,
-      :onclick => "this.href = this.href.replace(/cancel=(true|false)/,'cancel='+ $('##{id}').css('display') != 'none');",
+      :onclick => "this.href = this.href.replace(/cancel=(true|false)/,'cancel='+ ($('##{id}').css('display') != 'none'));",
       :class => options[:class]
     )
   end

diff --git a/app/views/admin/groups/_form.html.haml b/app/views/admin/groups/_form.html.haml
@@ -10,4 +10,4 @@
         %br
         = f.select :user_ids, User.all.map {|u| [u.full_name, u.id]}, {}, :multiple => true
         :javascript
-          new Chosen($('#group_user_ids'));
+          $('#group_user_ids').chosen();
diff --git a/app/views/admin/users/_profile.html.haml b/app/views/admin/users/_profile.html.haml
@@ -52,4 +52,4 @@
         .label #{t :groups}:
         = f.select :group_ids, Group.all.map {|g| [g.name, g.id]}, {}, :multiple => true
         :javascript
-          new Chosen($('#user_group_ids'));
+          $('#user_group_ids').chosen();
diff --git a/app/views/entities/_permissions.html.haml b/app/views/entities/_permissions.html.haml
@@ -24,15 +24,15 @@
             %br
             = f.select :user_ids, user_options, {}, :multiple => true
             :javascript
-              new Chosen($('#{model}_user_ids'));
+              $('#{model}_user_ids').chosen();
 
         %tr
           %td
             = f.label :group_ids, "#{t(:groups)}:"
             %br
             = f.select :group_ids, group_options, {}, :multiple => true
             :javascript
-              new Chosen($('#{model}_group_ids'));
+              $('#{model}_group_ids').chosen();
 
     - if !edit and entity.is_a?(Lead)
       .radio_box

diff --git a/app/views/leads/_convert_permissions.html.haml b/app/views/leads/_convert_permissions.html.haml
@@ -25,12 +25,12 @@
             %br
             = select :lead, :user_ids, user_options, {}, :multiple => true
             :javascript
-              new Chosen($('lead_user_ids'));
+              $('lead_user_ids').chosen();
 
         %tr
           %td
             = label_tag :lead_group_ids, "#{t(:groups)}:"
             %br
             = select :lead, :group_ids, group_options, {}, :multiple => true
             :javascript
-              new Chosen($('lead_group_ids'));
+              $('lead_group_ids').chosen();