fat_free_crm 0.16.4 → 0.17.1

data/app/views/accounts/destroy.js.haml

@@ -3,4 +3,4 @@
 
 $('##{dom_id(@entity)}').css('background-color', '#ffe4e1').slideUp(250);
 = refresh_sidebar(:index, :filters)
-$('#paginate').replaceWith('#{ j render(:partial => "shared/paginate_with_per_page") }');
+$('#paginate').replaceWith('#{ j render(partial: "shared/paginate_with_per_page") }');

data/app/views/accounts/edit.js.haml

@@ -8,14 +8,14 @@
     crm.flip_form('edit_#{entity_name}');
     crm.set_title('edit_#{entity_name}', '#{h @entity.name}');
   - else                                            # Called from index page...
-    $('##{id}').replaceWith('#{ j render(:partial => entity_name, :collection => [ @entity ]) }');
+    $('##{id}').replaceWith('#{ j render(partial: entity_name, collection: [ @entity ]) }');
 
 - else # <----------------------------------------  Show [Edit] form.
 
   - if params[:cancel].blank?                       # Called from index page...
     - if @previous                                  # Hide open [Edit] form if any.
       - if @previous.is_a?(@entity.class)
-        $('##{dom_id(@previous)}').replaceWith('#{ j render(:partial => entity_name, :collection => [ @previous ]) }');
+        $('##{dom_id(@previous)}').replaceWith('#{ j render(partial: entity_name, collection: [ @previous ]) }');
       - else
         crm.flick('#{entity_name}_#{@previous}', 'remove');
     -# Disable onMouseOver for the list item.
@@ -23,9 +23,9 @@
     -# Hide [Create] form if any.
     crm.hide_form('create_#{entity_name}');
     -# Show [Edit] form.
-    $('##{id}').html('#{ j render(:partial => "edit") }');
+    $('##{id}').html('#{ j render(partial: "edit") }');
 
   - elsif params[:cancel].false?                    # Called from title of the landing page...
-    $('#edit_#{entity_name}').html('#{ j render(:partial => "edit") }');
+    $('#edit_#{entity_name}').html('#{ j render(partial: "edit") }');
     crm.flip_form('edit_#{entity_name}');
     crm.set_title('edit_#{entity_name}', "#{t :edit} #{h @entity.name}");

data/app/views/accounts/index.js.haml

@@ -4,8 +4,8 @@
 - if @entities.any?
   $('##{entities}').html('#{ j render(@entities) }');
 - else
-  $('##{entities}').html('#{ j render(:partial => "shared/empty") }');
+  $('##{entities}').html('#{ j render(partial: "shared/empty") }');
 
-$('#paginate').html('#{ j render(:partial => "shared/paginate_with_per_page") }');
-$('#export').html('#{ j render(:partial => "shared/export") }');
-$('#search_results_count').html('#{ j render(:plain => t('search_results_count', :count => @search_results_count)) }');
+$('#paginate').html('#{ j render(partial: "shared/paginate_with_per_page") }');
+$('#export').html('#{ j render(partial: "shared/export") }');
+$('#search_results_count').html('#{ j render(plain: t('search_results_count', count: @search_results_count)) }');

data/app/views/accounts/index.xls.builder

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 xml.Worksheet 'ss:Name' => I18n.t(:tab_accounts) do
   xml.Table do
     unless @accounts.empty?
@@ -74,7 +76,7 @@ xml.Worksheet 'ss:Name' => I18n.t(:tab_accounts) do
           data.each do |value|
             xml.Cell do
               xml.Data value,
-                       'ss:Type' => "#{value.respond_to?(:abs) ? 'Number' : 'String'}"
+                       'ss:Type' => (value.respond_to?(:abs) ? 'Number' : 'String').to_s
             end
           end
         end

data/app/views/accounts/new.js.haml

@@ -5,7 +5,7 @@ crm.flick('empty', 'toggle');
 crm.flip_form('#{create_id}');
 
 - unless params[:cancel].true?
-  $('##{create_id}').html('#{ j render(:partial => "new") }');
+  $('##{create_id}').html('#{ j render(partial: "new") }');
   crm.set_title('#{create_id}', '#{ j t(create_id) }');
 - else
   crm.set_title('#{create_id}', '#{ j t(entity_name.pluralize) }');

data/app/views/accounts/show.html.haml

@@ -1,26 +1,26 @@
 - if (template = template_for_current_view)
-  = render(template, :account => @account)
+  = render(template, account: @account)
 - else
   
   -# default view
 
   = styles_for :task, :contact, :opportunity
 
-  = render 'accounts/title_bar', :account => @account
+  = render 'accounts/title_bar', account: @account
 
   %div#edit_account{ hidden }
 
-  = render "comments/new", :commentable => @account
-  = render :partial => "shared/timeline", :collection => @timeline
+  = render "comments/new", commentable: @account
+  = render partial: "shared/timeline", collection: @timeline
 
   = hook(:show_account_bottom, self, {entity: @account}) do
 
-    = render :partial => "tasks/tasks", :locals => {:object => @account}
+    = render partial: "tasks/tasks", locals: {object: @account}
 
-    = render "contacts/contacts", :object => @account
+    = render "contacts/contacts", object: @account
 
-    = render "opportunities/opportunities", :object => @account
+    = render "opportunities/opportunities", object: @account
 
-    = render "versions/versions", :object => @account
+    = render "versions/versions", object: @account
 
     = load_select_popups_for(@account, :tasks, :contacts, :opportunities)

data/app/views/accounts/show.js.haml

@@ -1,5 +1,5 @@
 - entity_name = controller.controller_name.singularize.underscore #account
 - @entity = instance_variable_get("@#{entity_name}")
 
-$('#main').html('#{ j (render :template => "#{entity_name.pluralize}/show.html", entity_name => @entity) }');
+$('#main').html('#{ j (render template: "#{entity_name.pluralize}/show.html", entity_name => @entity) }');
 = raw generate_js_for_popups(@entity, :tasks, :contacts, :opportunities)

data/app/views/accounts/update.js.haml

@@ -8,11 +8,11 @@
     crm.set_title('edit_#{entity_name}', '#{h @entity.name}');
     = refresh_sidebar(:show, :summary)
   - else
-    $('##{id}').replaceWith('#{ j render(:partial => entity_name, :collection => [ @entity ]) }');
+    $('##{id}').replaceWith('#{ j render(partial: entity_name, collection: [ @entity ]) }');
     $('##{id}').effect("highlight", { duration:1500 });
     = refresh_sidebar(:index, :filters)
 - else
-  $('##{id}').html('#{ j render(:partial => "edit") }');
+  $('##{id}').html('#{ j render(partial: "edit") }');
   $('##{id}').effect("shake", { duration:250, distance: 6 });
   $('##{dom_id(@entity, :edit)} input[type!=hidden]').first().focus();
 

data/app/views/admin/custom_fields/_base_field.html.haml

@@ -1,6 +1,8 @@
 %table
   %tr
     %td
+      .label.top Minlength:
+      = f.text_field :minlength
       .label.top Maxlength:
       = f.text_field :maxlength
     %td= spacer
@@ -13,9 +15,9 @@
         = f.label :disabled
   %tr
     %td
-      = f.label :hint, :class => "label top"
+      = f.label :hint, class: "label top"
       = f.text_field :hint
     %td= spacer
     %td
-      = f.label :placeholder, :class => "label top"
+      = f.label :placeholder, class: "label top"
       = f.text_field :placeholder

data/app/views/admin/custom_fields/_check_boxes_field.html.haml

@@ -1,6 +1,6 @@
 %div
   .label.top.req
     = "Select Options (pipe separated):"
-= f.text_field :collection_string, :class => 'field_collection_string', :size => 78
+= f.text_field :collection_string, class: 'field_collection_string', size: 78
 
-= render :partial => 'admin/custom_fields/base_field', :locals => {:f => f}
+= render partial: 'admin/custom_fields/base_field', locals: {f: f}

data/app/views/admin/custom_fields/_date_field.html.haml

@@ -11,4 +11,4 @@
         %br
         %span Disabled:
         = f.check_box :disabled
-        %div{:style => 'width: 240px;'}
+        %div{style: 'width: 240px;'}

data/app/views/admin/custom_fields/_date_pair_field.html.haml

@@ -1,7 +1,7 @@
 - field1 = f.object || CustomFieldPair.new
 - field2 = f.object.respond_to?(:paired_with) ? field1.paired_with : CustomFieldPair.new
 
-%table{:class => :pairs}
+%table{class: :pairs}
   = fields_for("pair[0]", field1) do |first|
     = fields_for("pair[1]", field2) do |second|
       %tr
@@ -18,4 +18,4 @@
             = first.check_box :disabled
             = first.hidden_field :id
             = second.hidden_field :id
-            %div{:style => 'width: 240px;'}
+            %div{style: 'width: 240px;'}

data/app/views/admin/custom_fields/_datetime_field.html.haml

@@ -11,4 +11,4 @@
         %br
         %span Disabled:
         = f.check_box :disabled
-        %div{:style => 'width: 240px;'}
+        %div{style: 'width: 240px;'}

data/app/views/admin/custom_fields/_datetime_pair_field.html.haml

@@ -1,7 +1,7 @@
 - field1 = f.object || CustomFieldPair.new
 - field2 = f.object.respond_to?(:paired_with) ? field1.paired_with : CustomFieldPair.new
 
-%table{:class => :pairs}
+%table{class: :pairs}
   = fields_for("pair[0]", field1) do |first|
     = fields_for("pair[1]", field2) do |second|
       %tr
@@ -18,4 +18,4 @@
             = first.check_box :disabled
             = first.hidden_field :id
             = second.hidden_field :id
-            %div{:style => 'width: 240px;'}
+            %div{style: 'width: 240px;'}

data/app/views/admin/custom_fields/_radio_field.html.haml

@@ -1,6 +1,6 @@
 %div
   .label.top.req
     = "Select Options (pipe separated):"
-= f.text_field :collection_string, :class => 'field_collection_string', :size => 78
+= f.text_field :collection_string, class: 'field_collection_string', size: 78
 
-= render :partial => 'admin/custom_fields/base_field', :locals => {:f => f}
+= render partial: 'admin/custom_fields/base_field', locals: {f: f}

data/app/views/admin/custom_fields/_select_field.html.haml

@@ -1,7 +1,7 @@
 %div
   .label.top.req
     = "Select Options (pipe separated):"
-= f.text_field :collection_string, :class => 'field_collection_string', :size => 78
+= f.text_field :collection_string, class: 'field_collection_string', size: 78
 
 %table
   %tr

data/app/views/admin/custom_fields/_string_field.html.haml

@@ -1,2 +1,2 @@
 
-= render :partial => 'admin/custom_fields/base_field', :locals => {:f => f}
+= render partial: 'admin/custom_fields/base_field', locals: {f: f}

data/app/views/admin/field_groups/_confirm.html.haml

@@ -1,5 +1,5 @@
 .confirm[@field_group, :confirm]
   #{t :field_group_confirm_delete}
   #{t :delete} <b>#{@field_group.name}</b>?
-  = link_to_confirm_delete(@field_group) << " : "
+  = link_to_confirm_delete(@field_group) + " : "
   = link_to_function(t(:no_button), "crm.flick('#{dom_id(@field_group, :confirm)}', 'remove')")

data/app/views/admin/field_groups/_edit.html.haml

@@ -1,8 +1,8 @@
-= form_for([:admin, @field_group], :html => one_submit_only, :remote => true) do |f|
+= form_for([:admin, @field_group], html: one_submit_only, remote: true) do |f|
   = link_to_close edit_admin_field_group_path(@field_group)
   = f.error_messages
-  = render :partial => "top_section", :locals => { :f => f, :edit => true }
+  = render partial: "top_section", locals: { f: f, edit: true }
   .buttonbar
-    = f.submit t(:save_field_group), :id => :field_group_submit
+    = f.submit t(:save_field_group), id: :field_group_submit
     or
     = link_to_cancel edit_admin_field_group_path(@field_group)

data/app/views/admin/field_groups/_field_group.html.haml

@@ -6,23 +6,23 @@
 
   .subtitle_tools
     - unless field_group.name == "custom_fields"
-      = link_to_inline(edit_form_id, edit_admin_field_group_path(field_group), :text => t(:edit_field_group))
+      = link_to_inline(edit_form_id, edit_admin_field_group_path(field_group), text: t(:edit_field_group))
       |
-    = link_to(arrow_for(create_form_id) + t(:create_field), '#', :class => 'create')
+    = link_to(arrow_for(create_form_id) + t(:create_field), '#', class: 'create')
     - unless field_group.name == "custom_fields"
       |
       = link_to_confirm(field_group)
 
-  .subtitle{ :id => "#{dom_id(field_group)}_title" }= field_group_subtitle(field_group)
+  .subtitle{ id: "#{dom_id(field_group)}_title" }= field_group_subtitle(field_group)
 
-  .remote{ hidden.merge(:id => edit_form_id) }
+  .remote{ hidden.merge(id: edit_form_id) }
 
   .list
-    %ul{ :id => dom_id(field_group, :fields), 'data-sortable' => sort_admin_fields_path(:field_group_id => field_group.id), 'data-sortable-connect-with' => '.fields', 'data-sortable-handle' => '.handle' }
-      = render :partial => "admin/fields/field", :collection => field_group.fields.without_pairs
+    %ul{ id: dom_id(field_group, :fields), 'data-sortable' => sort_admin_fields_path(field_group_id: field_group.id), 'data-sortable-connect-with' => '.fields', 'data-sortable-handle' => '.handle' }
+      = render partial: "admin/fields/field", collection: field_group.fields.without_pairs
       %li.empty
         = t(:field_group_empty)
-        = link_to t(:create_field), '#', :class => 'create', 'data-for' => create_form_id
+        = link_to t(:create_field), '#', class: 'create', 'data-for' => create_form_id
 
-    .remote{ hidden.merge(:id => create_form_id, :class => 'create_field') }
-      = render :partial => 'admin/fields/form', :locals => {:field_group_id => field_group.id}
+    .remote{ hidden.merge(id: create_form_id, class: 'create_field') }
+      = render partial: 'admin/fields/form', locals: {field_group_id: field_group.id}

data/app/views/admin/field_groups/_new.html.haml

@@ -1,10 +1,10 @@
-- path = new_admin_field_group_path(:klass_name => @field_group.klass_name)
+- path = new_admin_field_group_path(klass_name: @field_group.klass_name)
 
-= form_for([:admin, @field_group], :html => one_submit_only, :remote => true) do |f|
+= form_for([:admin, @field_group], html: one_submit_only, remote: true) do |f|
   = link_to_close path
   = f.error_messages
-  = render :partial => "top_section", :locals => { :f => f }
+  = render partial: "top_section", locals: { f: f }
   .buttonbar
-    = f.submit t(:create_field_group), :id => :field_group_submit
+    = f.submit t(:create_field_group), id: :field_group_submit
     or
     = link_to_cancel path

data/app/views/admin/field_groups/_top_section.html.haml

@@ -1,7 +1,7 @@
 .section
   = f.hidden_field :klass_name
 
-  %table{:style => 'width:auto;'}
+  %table{style: 'width:auto;'}
     %tr
       %td
         .label.top.req= t(:label) + ":"
@@ -10,5 +10,5 @@
       %td
         .label.top
           =t(:restrict_by_tag)
-          %small= t(:restrict_by_tag_info, :assets => f.object.klass_name.downcase.pluralize)
-        = f.select :tag_id, Tag.all.map { |tag| [tag.name, tag.id] }, :include_blank => true
+          %small= t(:restrict_by_tag_info, assets: f.object.klass_name.downcase.pluralize)
+        = f.select :tag_id, Tag.all.map { |tag| [tag.name, tag.id] }, include_blank: true, class: 'select2'

data/app/views/admin/field_groups/confirm.js.haml

@@ -3,5 +3,5 @@
 if ($('##{id}').size() > 0) {
 crm.flick('#{id}', 'remove');
 } else {
-$('##{dom_id(@field_group)}').prepend('#{ j (render :partial => "confirm") }');
+$('##{dom_id(@field_group)}').prepend('#{ j (render partial: "confirm") }');
 }

data/app/views/admin/field_groups/create.js.haml

@@ -6,9 +6,9 @@
 - if @field_group.valid?
   $('##{id}_arrow').html(crm.COLLAPSED);
   $('##{id}').slideUp( { duration:250, complete: function() {$(this).html('')} } );
-  $('##{container_id}').after('#{ j(render :partial => "field_group", :collection => [ @field_group ]) }');
+  $('##{container_id}').after('#{ j(render partial: "field_group", collection: [ @field_group ]) }');
   $('##{dom_id(@field_group)}').effect('highlight', { duration:1500 });
 
 - else
-  $('##{id}').html('#{ j render(:partial => "new") }');
+  $('##{id}').html('#{ j render(partial: "new") }');
   $('##{id}').effect("shake", { duration:250, distance: 6 });

data/app/views/admin/field_groups/edit.js.haml

@@ -9,4 +9,4 @@
 - else # <----------------------------------------- Show [Edit field_group] form.
 
   crm.show_form('#{form_id}');
-  $('##{form_id}').html('#{ j render(:partial => "edit") }');
+  $('##{form_id}').html('#{ j render(partial: "edit") }');

data/app/views/admin/field_groups/new.js.haml

@@ -5,4 +5,4 @@ crm.flick('empty', 'toggle');
 crm.flip_form('#{id}');
 
 - if params[:cancel] != "true"
-  $('##{id}').html('#{ j render(:partial => 'new') }');
+  $('##{id}').html('#{ j render(partial: 'new') }');

data/app/views/admin/field_groups/update.js.haml

@@ -4,5 +4,5 @@
   crm.flip_form('#{id}');
   crm.set_title('#{dom_id(@field_group)}', '#{field_group_subtitle(@field_group)}');
 - else
-  $('##{id}').html('#{ j render(:partial => 'edit') }');
+  $('##{id}').html('#{ j render(partial: 'edit') }');
   $('##{id}').effect('shake', { distance:5 }, 250);

data/app/views/admin/fields/_field.html.haml

@@ -1,17 +1,17 @@
-%li.highlight.position{:class => field.class.name.underscore, :id => dom_id(field)}
+%li.highlight.position{class: field.class.name.underscore, id: dom_id(field)}
   %span.handle
     = image_tag "sortable.gif"
 
   .tools
     %small
-      = link_to t(:edit), edit_admin_field_path(field), :class => 'edit'
-      = link_to_delete(field, :url => admin_field_path(field), :klass_name => 'Field')
+      = link_to t(:edit), edit_admin_field_path(field), class: 'edit'
+      = link_to_delete(field, url: admin_field_path(field), klass_name: 'Field')
 
   %tt
     %b= field.label
     == (#{t("field_types.#{field.as}.title")})
 
     = t(:added_ago, value: timeago(field.created_at)).html_safe
-    = hook(:field_bottom, self, :field => field) {}
+    = hook(:field_bottom, self, field: field) {}
 
   .edit_field

data/app/views/admin/fields/_form.html.haml

@@ -4,32 +4,32 @@
 - url = new_field ? admin_fields_path : admin_field_path
 - html_id = new_field ? nil : "edit_field_#{@field.id}"
 
-%div{:class => new_field ? nil : 'remote edit_field'}
-  = form_for([:admin, @field], :url => url, :as => :field, :html => {:class => nil, :id => html_id}, :remote => true) do |f|
-    = link_to( 'x', '#', :class => 'close', :title => t(:close_form) )
+%div{class: new_field ? nil : 'remote edit_field'}
+  = form_for([:admin, @field], url: url, as: :field, html: {class: nil, id: html_id}, remote: true) do |f|
+    = link_to( 'x', '#', class: 'close', title: t(:close_form) )
     = f.error_messages
 
-    = hidden_field_tag 'field[field_group_id]', field_group_id, :id => nil
+    = hidden_field_tag 'field[field_group_id]', field_group_id, id: nil
 
     .section
       %table
         %tr
           %td
             .label.top.req Field label:
-            = f.text_field :label, :id => nil
+            = f.text_field :label, id: nil
 
           %td= spacer
           %td
             .label.top.req Field type:
-            = select :field, :as, field_edit_as_options(@field), :include_blank => true, :id => nil
+            = select :field, :as, field_edit_as_options(@field), include_blank: true, id: nil, class: 'select2'
 
       .subform
-        = render(:partial => 'admin/fields/subform') unless new_field
+        = render(partial: 'admin/fields/subform') unless new_field
 
     .buttonbar
       - if new_field
-        = f.submit t(:create_field), :id => :field_submit
+        = f.submit t(:create_field), id: :field_submit
       - else
-        = f.submit t(:save_field), :id => :field_submit
+        = f.submit t(:save_field), id: :field_submit
       or
-      = link_to( t(:cancel), '#', :class => 'cancel' )
+      = link_to( t(:cancel), '#', class: 'cancel' )

data/app/views/admin/fields/_subform.html.haml

@@ -1,6 +1,6 @@
 
 = fields_for :field, @field do |f|
   - if (as = f.object.as).present? and lookup_context.exists? "#{as}_field", 'admin/custom_fields', true
-    = render :partial => "admin/custom_fields/#{as}_field", :locals => {:f => f}
+    = render partial: "admin/custom_fields/#{as}_field", locals: {f: f}
   - else
-    = render :partial => "admin/custom_fields/base_field", :locals => {:f => f}
+    = render partial: "admin/custom_fields/base_field", locals: {f: f}

data/app/views/admin/fields/create.js.haml

@@ -6,12 +6,12 @@
 
 - if @field.valid?
   $("##{id}_arrow").html(crm.COLLAPSED)
-  $('##{container_id}').append('#{ j (render :partial => "field", :collection => [@field]) }')
+  $('##{container_id}').append('#{ j (render partial: "field", collection: [@field]) }')
   $('##{custom_field_id}').effect("highlight", { duration:1500 });
   $("##{create_field_id}").hide();
   $("##{empty_field_id}").hide();
   $('##{container_id}').sortable('reset');
 - else
-  $('##{id}').html('#{ j render(:partial => "admin/fields/form", :locals => {:field_group_id => @field.field_group_id}) }')
+  $('##{id}').html('#{ j render(partial: "admin/fields/form", locals: {field_group_id: @field.field_group_id}) }')
   $('##{id}').effect("shake", { duration:250, distance: 6 });
   $('##{id}').find('input[type="text"]').first().focus()