fat_free_crm 0.11.0 → 0.11.1

data/app/assets/stylesheets/application.css.erb

@@ -28,6 +28,7 @@
  *= require chosen
  *= require ffcrm_chosen
  *= require fields
+ *= require_self
  */
 
 <%

data/app/assets/stylesheets/common.scss

@@ -686,3 +686,29 @@ span.handle img {
 
 .remove_fields img {
   vertical-align: text-bottom; }
+
+ul.tools {
+  display: inline;
+  li {
+    border-right: 1px black solid;
+    border-bottom: none;
+    padding: 0 4px;
+    font-size: 10px;
+    float: left;
+    clear: none; }
+  li:last-child {
+    border-right: none; } }
+
+.highlight {
+  background-color: white;
+  .tools {
+    visibility: hidden; } }
+
+.mail.highlight,
+.comment.highlight {
+  background-color: #f2f2f2; }
+
+.highlight:hover {
+  background-color: seashell;
+  .tools {
+    visibility: visible; } }

data/app/assets/stylesheets/ffcrm_chosen.scss

@@ -41,7 +41,7 @@ input {
   height: 17px;
   font-size: 13px; }
 
-input[type=submit] {
+input[type=submit], input[type=file] {
   height: auto; }
 
 select {

data/app/controllers/admin/application_controller.rb

@@ -15,7 +15,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #------------------------------------------------------------------------------
 
-class Admin::ApplicationController < BaseController
+class Admin::ApplicationController < EntitiesController
   layout "admin/application"
   before_filter :require_admin_user
 

data/app/controllers/application_controller.rb

@@ -129,14 +129,6 @@ private
     request.referer =~ %r(/#{controller}/\w+)
   end
 
-  #----------------------------------------------------------------------------
-  def update_recently_viewed
-    subject = instance_variable_get("@#{controller_name.singularize}")
-    if subject
-      Activity.log(current_user, subject, :viewed)
-    end
-  end
-
   #----------------------------------------------------------------------------
   def respond_to_not_found(*types)
     asset = self.controller_name.singularize

data/app/controllers/{accounts_controller.rb → entities/accounts_controller.rb}

@@ -15,7 +15,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #------------------------------------------------------------------------------
 
-class AccountsController < BaseController
+class AccountsController < EntitiesController
   before_filter :get_data_for_sidebar, :only => :index
 
   # GET /accounts
@@ -150,18 +150,6 @@ class AccountsController < BaseController
     render :index
   end
 
-  # GET /accounts/contacts                                                 AJAX
-  #----------------------------------------------------------------------------
-  def contacts
-    @account = Account.my.find(params[:id])
-  end
-
-  # GET /accounts/opportunities                                            AJAX
-  #----------------------------------------------------------------------------
-  def opportunities
-    @account = Account.my.find(params[:id])
-  end
-
   # POST /accounts/filter                                                  AJAX
   #----------------------------------------------------------------------------
   def filter

data/app/controllers/{campaigns_controller.rb → entities/campaigns_controller.rb}

@@ -15,7 +15,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #------------------------------------------------------------------------------
 
-class CampaignsController < BaseController
+class CampaignsController < EntitiesController
   before_filter :get_data_for_sidebar, :only => :index
 
   # GET /campaigns
@@ -140,18 +140,6 @@ class CampaignsController < BaseController
     end
   end
 
-  # GET /accounts/leads                                                    AJAX
-  #----------------------------------------------------------------------------
-  def leads
-    @campaign = Campaign.my.find(params[:id])
-  end
-
-  # GET /accounts/opportunities                                            AJAX
-  #----------------------------------------------------------------------------
-  def opportunities
-    @campaign = Campaign.my.find(params[:id])
-  end
-
   # POST /campaigns/redraw                                                 AJAX
   #----------------------------------------------------------------------------
   def redraw

data/app/controllers/{contacts_controller.rb → entities/contacts_controller.rb}

@@ -15,7 +15,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #------------------------------------------------------------------------------
 
-class ContactsController < BaseController
+class ContactsController < EntitiesController
   before_filter :get_users, :only => [ :new, :create, :edit, :update ]
   before_filter :get_accounts, :only => [ :new, :create, :edit, :update ]
 
@@ -154,12 +154,6 @@ class ContactsController < BaseController
     end
   end
 
-  # GET /contacts/opportunities                                            AJAX
-  #----------------------------------------------------------------------------
-  def opportunities
-    @contact = Contact.my.find(params[:id])
-  end
-
   # POST /contacts/redraw                                                  AJAX
   #----------------------------------------------------------------------------
   def redraw

data/app/controllers/{leads_controller.rb → entities/leads_controller.rb}

@@ -15,7 +15,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #------------------------------------------------------------------------------
 
-class LeadsController < BaseController
+class LeadsController < EntitiesController
   before_filter :get_data_for_sidebar, :only => :index
 
   # GET /leads

data/app/controllers/{opportunities_controller.rb → entities/opportunities_controller.rb}

@@ -15,7 +15,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #------------------------------------------------------------------------------
 
-class OpportunitiesController < BaseController
+class OpportunitiesController < EntitiesController
   before_filter :load_settings
   before_filter :get_data_for_sidebar, :only => :index
   before_filter :set_params, :only => [:index, :redraw, :filter]
@@ -181,12 +181,6 @@ class OpportunitiesController < BaseController
     end
   end
 
-  # GET /opportunities/contacts                                            AJAX
-  #----------------------------------------------------------------------------
-  def contacts
-    @opportunity = Opportunity.my.find(params[:id])
-  end
-
   # POST /opportunities/redraw                                             AJAX
   #----------------------------------------------------------------------------
   def redraw

data/app/controllers/{tasks_controller.rb → entities/tasks_controller.rb}

@@ -15,7 +15,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #------------------------------------------------------------------------------
 
-class TasksController < BaseController
+class TasksController < EntitiesController
   before_filter :auto_complete, :only => :auto_complete
   before_filter :update_sidebar, :only => :index
   skip_after_filter :update_recently_viewed

data/app/controllers/{base_controller.rb → entities_controller.rb}

@@ -15,7 +15,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #------------------------------------------------------------------------------
 
-class BaseController < ApplicationController
+class EntitiesController < ApplicationController
   before_filter :require_user
   before_filter :set_current_tab, :only => [ :index, :show ]
   after_filter  :update_recently_viewed, :only => :show
@@ -82,6 +82,30 @@ class BaseController < ApplicationController
     respond_to_not_found(:html, :js, :json, :xml)
   end
 
+  # GET /entities/contacts                                                 AJAX
+  #----------------------------------------------------------------------------
+  def contacts
+    @entity = klass.my.find(params[:id])
+  end
+
+  # GET /entities/leads                                                    AJAX
+  #----------------------------------------------------------------------------
+  def leads
+    @entity = klass.my.find(params[:id])
+  end
+
+  # GET /entities/opportunities                                            AJAX
+  #----------------------------------------------------------------------------
+  def opportunities
+    @entity = klass.my.find(params[:id])
+  end
+
+  # GET /entities/versions                                                 AJAX
+  #----------------------------------------------------------------------------
+  def versions
+    @entity = klass.my.find(params[:id])
+  end
+
   def timeline(asset)
     (asset.comments + asset.emails).sort { |x, y| y.created_at <=> x.created_at }
   end
@@ -152,4 +176,11 @@ class BaseController < ApplicationController
     scope = scope.paginate(pages)                 if wants.html? || wants.js? || wants.xml?
     scope
   end
+
+  #----------------------------------------------------------------------------
+  def update_recently_viewed
+    if item = instance_variable_get("@#{controller_name.singularize}")
+      item.send(item.class.versions_association_name).create(:event => :view, :whodunnit => PaperTrail.whodunnit)
+    end
+  end
 end

data/app/controllers/home_controller.rb

@@ -43,7 +43,7 @@ class HomeController < ApplicationController
   def options
     unless params[:cancel].true?
       @asset = @current_user.pref[:activity_asset] || "all"
-      @action = @current_user.pref[:activity_action_type] || "all_actions"
+      @action = @current_user.pref[:activity_event] || "all_events"
       @user = @current_user.pref[:activity_user] || "all_users"
       @duration = @current_user.pref[:activity_duration] || "two_days"
       @all_users = User.order("first_name, last_name")
@@ -54,7 +54,7 @@ class HomeController < ApplicationController
   #----------------------------------------------------------------------------
   def redraw
     @current_user.pref[:activity_asset] = params[:asset] if params[:asset]
-    @current_user.pref[:activity_action_type] = params[:action_type] if params[:action_type]
+    @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]
 
@@ -107,11 +107,11 @@ class HomeController < ApplicationController
   #----------------------------------------------------------------------------
   def get_activities(options = {})
     options[:asset]    ||= activity_asset
-    options[:action]   ||= activity_action_type
+    options[:event]    ||= activity_event
     options[:user]     ||= activity_user
     options[:duration] ||= activity_duration
 
-    Activity.latest(options).without_actions(:viewed).visible_to(@current_user)
+    Version.latest(options).visible_to(@current_user)
   end
 
   #----------------------------------------------------------------------------
@@ -125,12 +125,12 @@ class HomeController < ApplicationController
   end
 
   #----------------------------------------------------------------------------
-  def activity_action_type
-    action_type = @current_user.pref[:activity_action_type]
-    if action_type.nil? || action_type == "all_actions"
-      nil
+  def activity_event
+    event = @current_user.pref[:activity_event]
+    if event == "all_events"
+      %w(create update destroy)
     else
-      action_type
+      event
     end
   end
 

data/app/controllers/lists_controller.rb

@@ -1,3 +1,20 @@
+# Fat Free CRM
+# Copyright (C) 2008-2011 by Michael Dvorkin
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#------------------------------------------------------------------------------
+
 class ListsController < ApplicationController
   respond_to :js
 

data/app/helpers/admin/tags_helper.rb

@@ -19,4 +19,4 @@ module Admin::TagsHelper
   def link_to_confirm(tag)
     link_to(t(:delete) + "?", confirm_admin_tag_path(tag), :method => :get, :remote => true)
   end
-end
+end

data/app/helpers/application_helper.rb

@@ -208,16 +208,6 @@ module ApplicationHelper
     you_ask ? invisible : visible
   end
 
-  #----------------------------------------------------------------------------
-  def highlightable(id = nil, color = {})
-    color = { :on => "seashell", :off => "white" }.merge(color)
-    show = (id ? "$('#{id}').style.visibility='visible'" : "")
-    hide = (id ? "$('#{id}').style.visibility='hidden'" : "")
-    { :onmouseover => "this.style.background='#{color[:on]}'; #{show}",
-      :onmouseout  => "this.style.background='#{color[:off]}'; #{hide}"
-    }
-  end
-
   #----------------------------------------------------------------------------
   def confirm_delete(model, params = {})
     question = %(<span class="warn">#{t(:confirm_delete, model.class.to_s.downcase)}</span>).html_safe
@@ -313,11 +303,21 @@ module ApplicationHelper
   # gravatar. For leads and contacts we always use gravatars.
   #----------------------------------------------------------------------------
   def avatar_for(model, args = {})
-    args = { :class => 'gravatar', :size => '75x75' }.merge(args)
+    args = { :class => 'gravatar', :size => :large }.merge(args)
     if model.avatar
-      image_tag(model.avatar.image.url(Avatar.styles[args[:size]]), args)
+      Avatar
+      image_tag(model.avatar.image.url(args[:size]), args)
     elsif model.email
-      gravatar_image_tag(model.email, { :gravatar => { :default => default_avatar_url } }.merge(args))
+      # Gravatar requires '75x75' format, so convert symbols keys (e.g. :large)
+      if style_size = Avatar::STYLES[args[:size]]
+        args[:size] = style_size.sub(/\#$/,'')
+      end
+      # If we are passing an explicit w*h override (for uploaded avatars),
+      # then use that as the size.
+      if args[:width] && args[:height]
+        args[:size] = [:width, :height].map{|d|args[d]}.join("x")
+      end
+      gravatar_for(model, args)
     else
       image_tag("avatar.jpg", args)
     end
@@ -332,7 +332,7 @@ module ApplicationHelper
 
   #----------------------------------------------------------------------------
   def default_avatar_url
-    "#{request.protocol + request.host_with_port}" + Setting.base_url.to_s + "/assets/avatar.jpg"
+    request.protocol + request.host_with_port + image_path('avatar.jpg')
   end
 
   # Returns default permissions intro.

data/app/helpers/crm_tags_helper.rb

@@ -42,7 +42,7 @@ module CrmTagsHelper
 
   # Return asset tags to be built manually if the asset failed validation.
   def unsaved_param_tags(asset)
-    params[asset][:tag_list].split(",").map {|x|
+    params[asset][:tag_list].join.split(",").map {|x|
       Tag.find_by_name(x.strip)
     }.compact.uniq
   end

data/app/helpers/home_helper.rb

@@ -17,21 +17,21 @@
 
 module HomeHelper
   def sort_by_assets
-    Activity::ASSETS.map do |asset|
-      %Q[{ name: "#{t(asset).singularize}", on_select: function() { #{redraw(:asset, [ asset, t(asset).singularize.downcase ], url_for(:action => :redraw))} } }]
+    Version::ASSETS.map do |asset|
+      %Q[{ name: "#{t(asset.singularize)}", on_select: function() { #{redraw(:asset, [ asset, t(asset.singularize).downcase ], url_for(:action => :redraw))} } }]
     end
   end
 
   #----------------------------------------------------------------------------
-  def sort_by_actions
-    Activity::ACTIONS.map do |action|
-      %Q[{ name: "#{t(action + '_past_participle')}", on_select: function() { #{redraw(:action_type, [ action, t(action + '_past_participle').downcase ], url_for(:action => :redraw))} } }]
+  def sort_by_events
+    Version::EVENTS.map do |event|
+      %Q[{ name: "#{t(event + '_past_participle')}", on_select: function() { #{redraw(:event, [ event, t(event + '_past_participle').downcase ], url_for(:action => :redraw))} } }]
     end
   end
 
   #----------------------------------------------------------------------------
   def sort_by_duration
-    Activity::DURATION.map do |duration|
+    Version::DURATION.map do |duration|
       %Q[{ name: "#{t(duration)}", on_select: function() { #{redraw(:duration, [ duration, t(duration).downcase ], url_for(:action => :redraw))} } }]
     end
   end
@@ -52,16 +52,14 @@ module HomeHelper
   #----------------------------------------------------------------------------
   def activity_title(activity)
     user    = activity.user.full_name
-    action  = t('action_' + activity.action)
-    type    = t('subject_' + activity.subject_type.downcase)
-    subject = if activity.subject
-      if activity.subject.respond_to?(:full_name)
-        activity.subject.full_name
-      else
-        activity.subject.name
+    action  = t('action_' + activity.event)
+    type    = t('subject_' + activity.item_type.downcase)
+    subject = if item = activity.item
+      if item.respond_to?(:full_name)
+        item.full_name
+      elsif item.respond_to?(:name)
+        item.name
       end
-    else
-      activity.info # Use info if the subject has been deleted.
     end
     t(:activity_text, :user => user, :action => action, :type => type, :subject => subject,
       :default => "#{user} #{action} #{type} #{subject}")

data/app/helpers/lists_helper.rb

@@ -1,2 +1,19 @@
+# Fat Free CRM
+# Copyright (C) 2008-2011 by Michael Dvorkin
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#------------------------------------------------------------------------------
+
 module ListsHelper
 end