fat_free_crm 0.13.2 → 0.13.3

data/app/assets/stylesheets/lists.css.scss

@@ -6,7 +6,21 @@
 // Place all the styles related to the Lists controller here.
 // They will automatically be included in application.css.
 // You can use Sass (SCSS) here: http://sass-lang.com/
-#lists, #personal_lists {
-	i.fa {font-size: 130%}
-	a:hover {background:none; color:#0033cc}
+
+.lists {
+  i.fa { font-size: 130% }
+  a:hover { background:none; color:#0033cc }
+  .list_icon { opacity: 0.5; }
+  img.input_info { vertical-align: middle; }
+  .list_save {
+    text-align: right;
+    margin: 10px 0 0;
+  }
+  .list_form {
+    margin: 10px 0 0;
+    input[type=submit] {
+      margin-top: 10px;
+      vertical-align: baseline;
+    }
+  }
 }

data/app/controllers/admin/groups_controller.rb

@@ -35,7 +35,8 @@ class Admin::GroupsController < Admin::ApplicationController
   # POST /groups
   #----------------------------------------------------------------------------
   def create
-    @group.update_attributes(params[:group])
+    @group.attributes = params[:group]
+    @group.save
 
     respond_with(@group)
   end

data/app/controllers/application_controller.rb

@@ -42,7 +42,7 @@ class ApplicationController < ActionController::Base
     respond_to do |format|
       format.any(:js, :html)   { render :partial => 'auto_complete' }
       format.json { render :json => @auto_complete.inject({}){|h,a|
-        h[a.id] = a.respond_to?(:full_name) ? j(a.full_name) : j(a.name); h
+        h[a.id] = a.respond_to?(:full_name) ? h(a.full_name) : h(a.name); h
       }}
     end
   end
@@ -120,7 +120,7 @@ private
       flash[:notice] = t(:msg_login_needed) if request.fullpath != "/"
       respond_to do |format|
         format.html { redirect_to login_url }
-        format.js   { render(:index) { |page| page.redirect_to login_url } }
+        format.js   { render :text => "window.location = '#{login_url}';" }
       end
     end
   end
@@ -202,7 +202,7 @@ private
 
     respond_to do |format|
       format.html { redirect_to(redirection_url) }
-      format.js   { render(:update) { |page| page.reload } }
+      format.js   { render :text => 'window.location.reload();' }
       format.json { render :text => flash[:warning],  :status => :not_found }
       format.xml  { render :xml => [flash[:warning]], :status => :not_found }
     end
@@ -216,7 +216,7 @@ private
     url = send("#{related.pluralize}_path")
     respond_to do |format|
       format.html { redirect_to(url) }
-      format.js   { render(:update) { |page| page.redirect_to(url) } }
+      format.js   { render :text => %Q{window.location.href = "#{url}";} }
       format.json { render :text => flash[:warning],  :status => :not_found }
       format.xml  { render :xml => [flash[:warning]], :status => :not_found }
     end
@@ -227,7 +227,7 @@ private
     flash[:warning] = t(:msg_not_authorized, default: 'You are not authorized to take this action.')
     respond_to do |format|
       format.html { redirect_to(redirection_url) }
-      format.js   { render(:update) { |page| page.reload } }
+      format.js   { render :text => 'window.location.reload();' }
       format.json { render :text => flash[:warning],  :status => :unauthorized }
       format.xml  { render :xml => [flash[:warning]], :status => :unauthorized }
     end

data/app/controllers/entities/accounts_controller.rb

@@ -98,7 +98,7 @@ class AccountsController < EntitiesController
   #----------------------------------------------------------------------------
   # Handled by ApplicationController :auto_complete
 
-  # POST /accounts/redraw                                                  AJAX
+  # GET /accounts/redraw                                                   AJAX
   #----------------------------------------------------------------------------
   def redraw
     current_user.pref[:accounts_per_page] = params[:per_page] if params[:per_page]

data/app/controllers/entities/campaigns_controller.rb

@@ -136,7 +136,7 @@ class CampaignsController < EntitiesController
   #----------------------------------------------------------------------------
   # Handled by ApplicationController :auto_complete
 
-  # POST /campaigns/redraw                                                 AJAX
+  # GET /campaigns/redraw                                                  AJAX
   #----------------------------------------------------------------------------
   def redraw
     current_user.pref[:campaigns_per_page] = params[:per_page] if params[:per_page]

data/app/controllers/entities/contacts_controller.rb

@@ -116,7 +116,7 @@ class ContactsController < EntitiesController
   #----------------------------------------------------------------------------
   # Handled by ApplicationController :auto_complete
 
-  # POST /contacts/redraw                                                  AJAX
+  # GET /contacts/redraw                                                   AJAX
   #----------------------------------------------------------------------------
   def redraw
     current_user.pref[:contacts_per_page] = params[:per_page] if params[:per_page]

data/app/controllers/entities/leads_controller.rb

@@ -157,7 +157,7 @@ class LeadsController < EntitiesController
   # Handled by ApplicationController :auto_complete
 
 
-  # POST /leads/redraw                                                     AJAX
+  # GET /leads/redraw                                                      AJAX
   #----------------------------------------------------------------------------
   def redraw
     current_user.pref[:leads_per_page] = params[:per_page] if params[:per_page]

data/app/controllers/entities/opportunities_controller.rb

@@ -145,7 +145,7 @@ class OpportunitiesController < EntitiesController
   #----------------------------------------------------------------------------
   # Handled by ApplicationController :auto_complete
 
-  # POST /opportunities/redraw                                             AJAX
+  # GET /opportunities/redraw                                              AJAX
   #----------------------------------------------------------------------------
   def redraw
     @opportunities = get_opportunities(:page => 1, :per_page => params[:per_page])

data/app/controllers/home_controller.rb

@@ -10,9 +10,9 @@ class HomeController < ApplicationController
   #----------------------------------------------------------------------------
   def index
     @activities = get_activities
-    @my_tasks = Task.visible_on_dashboard(current_user).by_due_at
-    @my_opportunities = Opportunity.visible_on_dashboard(current_user).by_closes_on.by_amount
-    @my_accounts = Account.visible_on_dashboard(current_user).by_name
+    @my_tasks = Task.visible_on_dashboard(current_user).includes(:user, :asset).by_due_at
+    @my_opportunities = Opportunity.visible_on_dashboard(current_user).includes(:account, :user, :tags).by_closes_on.by_amount
+    @my_accounts = Account.visible_on_dashboard(current_user).includes(:user, :tags).by_name
     respond_with(@activities)
   end
 
@@ -28,15 +28,18 @@ class HomeController < ApplicationController
     end
   end
 
-  # POST /home/redraw                                                      AJAX
+  # GET /home/redraw                                                       AJAX
   #----------------------------------------------------------------------------
   def redraw
     current_user.pref[:activity_asset] = params[:asset] if params[:asset]
     current_user.pref[:activity_event] = params[:event] if params[:event]
     current_user.pref[:activity_user] = params[:user] if params[:user]
     current_user.pref[:activity_duration] = params[:duration] if params[:duration]
+    @activities = get_activities
 
-    render :index
+    respond_with(@activities) do |format|
+      format.js { render :index }
+    end
   end
 
   # GET /home/toggle                                                       AJAX
@@ -94,7 +97,7 @@ class HomeController < ApplicationController
     options[:duration] ||= activity_duration
     options[:max]      ||= 500
 
-    Version.latest(options).visible_to(current_user)
+    Version.includes(user: [:avatar]).latest(options).visible_to(current_user)
   end
 
   #----------------------------------------------------------------------------
@@ -144,7 +147,7 @@ class HomeController < ApplicationController
     duration = current_user.pref[:activity_duration]
     if duration
       words = duration.split("_") # "two_weeks" => 2.weeks
-      if %w(one two).include?(words.first)
+      if %w(one two).include?(words.first) and %w(hour day days week weeks month).include?(words.last)
         %w(zero one two).index(words.first).send(words.last)
       end
     end

data/app/controllers/tasks_controller.rb

@@ -134,6 +134,21 @@ class TasksController < ApplicationController
     respond_with(@task)
   end
 
+  # PUT /tasks/1/uncomplete
+  #----------------------------------------------------------------------------
+  def uncomplete
+    @task = Task.tracked_by(current_user).find(params[:id])
+    @task.update_attributes(:completed_at => nil, :completed_by => nil) if @task
+
+    # Make sure bucket's div gets hidden if we're deleting last task in the bucket.
+    if Task.bucket_empty?(params[:bucket], current_user, @view)
+      @empty_bucket = params[:bucket]
+    end
+
+    update_sidebar
+    respond_with(@task)
+  end
+
   # POST /tasks/auto_complete/query                                        AJAX
   #----------------------------------------------------------------------------
   # Handled by ApplicationController :auto_complete

data/app/controllers/users_controller.rb

@@ -75,8 +75,10 @@ class UsersController < ApplicationController
       render
     else
       if params[:avatar]
-        @user.avatar = Avatar.new(params[:avatar].merge(:entity => @user))
-        unless @user.save && @user.avatar.errors.blank?
+        avatar = Avatar.create(params[:avatar].merge(:entity => @user))
+        if avatar.valid?
+          @user.avatar = avatar
+        else
           @user.avatar.errors.clear
           @user.avatar.errors.add(:image, t(:msg_bad_image_file))
         end
@@ -116,11 +118,11 @@ class UsersController < ApplicationController
     respond_with(@user)
   end
 
-  # POST /users/1/redraw
+  # GET /users/1/redraw
   #----------------------------------------------------------------------------
   def redraw
     current_user.preference[:locale] = params[:locale]
-    render(:update) { |page| page.redirect_to user_path(current_user) }
+    render :js => %Q{window.location.href = "#{user_path(current_user)}";}
   end
 
   # GET /users/opportunities_overview

data/app/helpers/accounts_helper.rb

@@ -22,14 +22,17 @@ module AccountsHelper
     ].join(', ')
   end
 
+  # Generates a select list with the first 25 accounts
+  # and prepends the currently selected account, if any.
+  #----------------------------------------------------------------------------
   def account_select(options = {})
-      # Generates a select list with the first 25 accounts,
-      # and prepends the currently selected account, if available
       options[:selected] = (@account && @account.id) || 0
       accounts = ([@account] + Account.my.order(:name).limit(25)).compact.uniq
       collection_select :account, :id, accounts, :id, :name, options,
                         {:"data-placeholder" => t(:select_an_account),
-                         :style => "width:330px; display:none;" }
+                         :"data-url" => auto_complete_accounts_path(format: 'json'),
+                         :style => "width:330px; display:none;",
+                         :class => 'ajax_chosen' }
   end
 
   # Select an existing account or create a new one.
@@ -42,11 +45,11 @@ module AccountsHelper
       t(:account).html_safe +
 
       content_tag(:span, :id => 'account_create_title') do
-        "(#{t :create_new} #{t :or} <a href='#' onclick='crm.select_account(1); return false;'>#{t :select_existing}</a>):".html_safe
+        "(#{t :create_new} #{t :or} <a href='#' onclick='crm.select_account(); return false;'>#{t :select_existing}</a>):".html_safe
       end.html_safe +
 
       content_tag(:span, :id => 'account_select_title') do
-        "(<a href='#' onclick='crm.create_account(1); return false;'>#{t :create_new}</a> #{t :or} #{t :select_existing}):".html_safe
+        "(<a href='#' onclick='crm.create_account(); return false;'>#{t :create_new}</a> #{t :or} #{t :select_existing}):".html_safe
       end.html_safe +
 
       content_tag(:span, ':', :id => 'account_disabled_title').html_safe

data/app/helpers/application_helper.rb

@@ -63,7 +63,7 @@ module ApplicationHelper
   def load_select_popups_for(related, *assets)
     js = generate_js_for_popups(related, *assets)
     content_for(:javascript_epilogue) do
-      raw "document.observe('dom:loaded', function() { #{js} });"
+      raw "$(function() { #{js} });"
     end
   end
 
@@ -91,7 +91,7 @@ module ApplicationHelper
     link_to(text,
       url + "#{url.include?('?') ? '&' : '?'}cancel=false" + related,
       :remote => true,
-      :onclick => "this.href = this.href.replace(/cancel=(true|false)/,'cancel='+ Element.visible('#{id}'));",
+      :onclick => "this.href = this.href.replace(/cancel=(true|false)/,'cancel='+ ($('##{id}').css('display') != 'none'));",
       :class => options[:class]
     )
   end
@@ -179,7 +179,7 @@ module ApplicationHelper
     tabs = [ :campaigns, :accounts, :leads, :contacts, :opportunities ]
     current = tabs.first unless tabs.include?(current)
     tabs.map do |tab|
-      link_to_function(t("tab_#{tab}"), "crm.jumper('#{tab}')", :class => (tab == current ? 'selected' : ''))
+      link_to_function(t("tab_#{tab}"), "crm.jumper('#{tab}')", "html-data" => tab, :class => (tab == current ? 'selected' : ''))
     end.join(" | ").html_safe
   end
 
@@ -196,7 +196,7 @@ module ApplicationHelper
 
   #----------------------------------------------------------------------------
   def one_submit_only(form='')
-    { :onsubmit => "jQuery('#'+this.id+' input[type=\\'submit\\']').disable()".html_safe }
+    { :onsubmit => "$('#'+this.id+' input[type=submit]').prop('disabled', true)".html_safe }
   end
 
   #----------------------------------------------------------------------------
@@ -213,9 +213,9 @@ module ApplicationHelper
   def confirm_delete(model, params = {})
     question = %(<span class="warn">#{t(:confirm_delete, model.class.to_s.downcase)}</span>).html_safe
     yes = link_to(t(:yes_button), params[:url] || model, :method => :delete)
-    no = link_to_function(t(:no_button), "jQuery('#menu').html(jQuery('#confirm').html());")
-    text = "jQuery('#confirm').html( jQuery('#menu').html() );\n"
-    text << "jQuery('#menu').html('#{question} #{yes} : #{no}');"
+    no = link_to_function(t(:no_button), "$('#menu').html($('#confirm').html());")
+    text = "$('#confirm').html( $('#menu').html() );\n"
+    text << "$('#menu').html('#{question} #{yes} : #{no}');"
     text.html_safe
   end
 
@@ -234,8 +234,8 @@ module ApplicationHelper
   #----------------------------------------------------------------------------
   def refresh_sidebar_for(view, action = nil, shake = nil)
     text = ""
-    text << "jQuery('#sidebar').html('#{ j render(:partial => "layouts/sidebar", :locals => { :view => view, :action => action }) }');"
-    text << "jQuery('##{j shake.to_s}').effect('shake', { duration:200, distance: 3 });" if shake
+    text << "$('#sidebar').html('#{ j render(:partial => "layouts/sidebar", :locals => { :view => view, :action => action }) }');"
+    text << "$('##{j shake.to_s}').effect('shake', { duration:200, distance: 3 });" if shake
     text.html_safe
   end
 
@@ -257,40 +257,41 @@ module ApplicationHelper
 
   # Ajax helper to refresh current index page once the user selects an option.
   #----------------------------------------------------------------------------
-  def redraw(option, value, url = nil)
+  def redraw(option, value, url = send("redraw_#{controller.controller_name}_path"))
     if value.is_a?(Array)
       param, value = value.first, value.last
     end
-    remote_function(
-      :url       => url || send("redraw_#{controller.controller_name}_path"),
-      :with      => "'#{option}=#{param || value}'",
-      :condition => "$('#{option}').innerHTML != '#{value}'",
-      :loading   => "$('#{option}').update('#{value}'); $('loading').show()",
-      :complete  => "$('loading').hide()"
-    )
+    %Q{
+      if ($('##{option}').html() != '#{value}') {
+        $('##{option}').html('#{value}');
+        $('#loading').show();
+        $.post('#{url}', {#{option}: '#{param || value}'}, function () {
+          $('#loading').hide();
+        });
+      }
+    }
   end
 
   #----------------------------------------------------------------------------
-  def options_menu_item(option, key, url = nil)
+  def options_menu_item(option, key, url = send("redraw_#{controller.controller_name}_path"))
     name = t("option_#{key}")
     "{ name: \"#{name.titleize}\", on_select: function() {" +
-    remote_function(
-      :url       => url || send("redraw_#{controller.controller_name}_path"),
-      :with      => "'#{option}=#{key}&query=' + $(\"query\").value",
-      :condition => "$('#{option}').innerHTML != '#{name}'",
-      :loading   => "$('#{option}').update('#{name}'); $('loading').show()",
-      :complete  => "$('loading').hide()"
-    ) + "}}"
+    %Q{
+      if ($('##{option}').html() != '#{name}') {
+        $('##{option}').html('#{name}');
+        $('#loading').show();
+        $.get('#{url}', {#{option}: '#{key}', query: $('#query').val()}, function () {
+          $('#loading').hide();
+        });
+      }
+    } + "}}"
   end
 
   # Ajax helper to pass browser timezone offset to the server.
   #----------------------------------------------------------------------------
   def get_browser_timezone_offset
     unless session[:timezone_offset]
-      remote_function(
-        :url  => timezone_path,
-        :with => "'offset='+(new Date()).getTimezoneOffset()"
-      )
+      "$.get('#{timezone_path}', {offset: (new Date()).getTimezoneOffset()});"
     end
   end
 
@@ -387,15 +388,18 @@ module ApplicationHelper
 
   def entity_filter_checkbox(name, value, count)
     checked = (session["#{controller_name}_filter"].present? ? session["#{controller_name}_filter"].split(",").include?(value.to_s) : count.to_i > 0)
-    values = %Q{$$("input[name='#{name}[]']").findAll(function (el) { return el.checked }).pluck("value")}
-    params = h(%Q{"#{name}=" + #{values} + "&query=" + $("query").value})
-
-    onclick = remote_function(
-      :url      => { :action => :filter },
-      :with     => params,
-      :loading  => "$('loading').show()",
-      :complete => "$('loading').hide()"
-    )
+    url = url_for(:action => :filter)
+    onclick = %Q{
+      var query = $('#query').val(),
+          values = [];
+      $('input[name=&quot;#{name}[]&quot;]').filter(':checked').each(function () {
+        values.push(this.value);
+      });
+      $('#loading').show();
+      $.post('#{url}', {#{name}: values.join(','), query: query}, function () {
+        $('#loading').hide();
+      });
+    }.html_safe
     check_box_tag("#{name}[]", value, checked, :id => value, :onclick => onclick)
   end
 
@@ -470,7 +474,7 @@ module ApplicationHelper
   end
 
   #----------------------------------------------------------------------------
-  # Generate the html for jQuery.timeago function
+  # Generate the html for $.timeago function
   # <span class="timeago" datetime="2008-07-17T09:24:17Z">July 17, 2008</span>
   def timeago(time, options = {})
     options[:class] ||= "timeago"
@@ -491,4 +495,14 @@ module ApplicationHelper
     end
   end
 
+  #----------------------------------------------------------------------------
+  # Ajaxification FTW!
+  # e.g. collection = Opportunity.my.scope
+  #         options = { renderer: {...} , params: {...}
+  def paginate(options = {})
+    collection = options.delete(:collection)
+    options = { renderer: RemoteLinkPaginationHelper::LinkRenderer }.merge(options)
+    will_paginate(collection, options)
+  end
+
 end

data/app/helpers/campaigns_helper.rb

@@ -32,4 +32,5 @@ module CampaignsHelper
     metrics = render :file => "campaigns/_metrics.html.haml", :locals => { :campaign => campaign }
     "#{t(campaign.status)}, " << [ status, metrics ].map { |str| strip_tags(str) }.join(' ').gsub("\n", '')
   end
+
 end

data/app/helpers/leads_helper.rb

@@ -31,9 +31,9 @@ module LeadsHelper
   def confirm_reject(lead)
     question = %(<span class="warn">#{t(:reject_lead_confirm)}</span>)
     yes = link_to(t(:yes_button), reject_lead_path(lead), :method => :put)
-    no = link_to_function(t(:no_button), "jQuery('#menu').html(jQuery('#confirm').html());")
-    text = "jQuery('#confirm').html( jQuery('#menu').html() );\n"
-    text << "jQuery('#menu').html('#{question} #{yes} : #{no}');"
+    no = link_to_function(t(:no_button), "$('#menu').html($('#confirm').html());")
+    text = "$('#confirm').html( $('#menu').html() );\n"
+    text << "$('#menu').html('#{question} #{yes} : #{no}');"
     text.html_safe
   end