fat_free_crm 0.11.4 → 0.12.0

data/app/models/polymorphic/tag.rb

@@ -1,20 +1,8 @@
-# Fat Free CRM
-# Copyright (C) 2008-2011 by Michael Dvorkin
+# Copyright (c) 2008-2013 Michael Dvorkin and contributors.
 #
-# 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/>.
+# Fat Free CRM is freely distributable under the terms of MIT license.
+# See MIT-LICENSE file or http://www.opensource.org/licenses/mit-license.php
 #------------------------------------------------------------------------------
-
 class Tag < ActsAsTaggableOn::Tag
   before_destroy :no_associated_field_groups
 
@@ -22,10 +10,12 @@ class Tag < ActsAsTaggableOn::Tag
   def no_associated_field_groups
     FieldGroup.find_all_by_tag_id(self).none?
   end
-  
+
   # Returns a count of taggings per model klass
   # e.g. {"Contact" => 3, "Account" => 1}
   def model_tagging_counts
     Tagging.where(:tag_id => id).count(:group => :taggable_type)
   end
+
+  ActiveSupport.run_load_hooks(:fat_free_crm_tag, self)
 end

data/app/models/polymorphic/tagging.rb

@@ -1,19 +1,8 @@
-# Fat Free CRM
-# Copyright (C) 2008-2011 by Michael Dvorkin
+# Copyright (c) 2008-2013 Michael Dvorkin and contributors.
 #
-# 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/>.
+# Fat Free CRM is freely distributable under the terms of MIT license.
+# See MIT-LICENSE file or http://www.opensource.org/licenses/mit-license.php
 #------------------------------------------------------------------------------
-
 class Tagging < ActsAsTaggableOn::Tagging
+  ActiveSupport.run_load_hooks(:fat_free_crm_tagging, self)
 end

data/app/models/polymorphic/task.rb

@@ -1,20 +1,8 @@
-# Fat Free CRM
-# Copyright (C) 2008-2011 by Michael Dvorkin
+# Copyright (c) 2008-2013 Michael Dvorkin and contributors.
 #
-# 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/>.
+# Fat Free CRM is freely distributable under the terms of MIT license.
+# See MIT-LICENSE file or http://www.opensource.org/licenses/mit-license.php
 #------------------------------------------------------------------------------
-
 # == Schema Information
 #
 # Table name: tasks
@@ -244,11 +232,13 @@ class Task < ActiveRecord::Base
   rescue ArgumentError
     errors.add(:calendar, :invalid_date)
   end
-  
+
   #----------------------------------------------------------------------------
   def parse_calendar_date
     # always in 2012-10-28 06:28 format regardless of language
     Time.parse(self.calendar)
   end
 
+  ActiveSupport.run_load_hooks(:fat_free_crm_task, self)
+
 end

data/app/models/setting.rb

@@ -1,20 +1,8 @@
-# Fat Free CRM
-# Copyright (C) 2008-2011 by Michael Dvorkin
+# Copyright (c) 2008-2013 Michael Dvorkin and contributors.
 #
-# 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/>.
+# Fat Free CRM is freely distributable under the terms of MIT license.
+# See MIT-LICENSE file or http://www.opensource.org/licenses/mit-license.php
 #------------------------------------------------------------------------------
-
 # == Schema Information
 #
 # Table name: settings
@@ -114,6 +102,7 @@ class Setting < ActiveRecord::Base
     # Loads settings from YAML files
     def load_settings_from_yaml(file)
       begin
+        YAML::ENGINE.yamler = 'syck' # remove this when files are converted to Psych
         settings = YAML.load_file(file)
         # Merge settings into current settings hash (recursively)
         @@yaml_settings.deep_merge!(settings)
@@ -123,13 +112,6 @@ class Setting < ActiveRecord::Base
       yaml_settings
     end
   end
-end
-
 
-# Load default settings, then override with custom settings, if present.
-setting_files = [FatFreeCRM.root.join("config", "settings.default.yml")]
-# Don't override default settings in test environment
-setting_files << Rails.root.join("config", "settings.yml") unless Rails.env == 'test'
-setting_files.each do |settings_file|
-  Setting.load_settings_from_yaml(settings_file) if File.exist?(settings_file)
+  ActiveSupport.run_load_hooks(:fat_free_crm_setting, self)
 end

data/app/models/users/ability.rb

@@ -1,3 +1,8 @@
+# Copyright (c) 2008-2013 Michael Dvorkin and contributors.
+#
+# Fat Free CRM is freely distributable under the terms of MIT license.
+# See MIT-LICENSE file or http://www.opensource.org/licenses/mit-license.php
+#------------------------------------------------------------------------------
 # See the wiki for details: https://github.com/ryanb/cancan/wiki/Defining-Abilities
 
 class Ability
@@ -12,7 +17,7 @@ class Ability
       can :manage, entities, :access => 'Public'
       can :manage, entities + [Task], :user_id => user.id
       can :manage, entities + [Task], :assigned_to => user.id
-      
+
       #
       # Due to an obscure bug (see https://github.com/ryanb/cancan/issues/213)
       # we must switch on user.admin? here to avoid the nil constraints which
@@ -35,7 +40,9 @@ class Ability
           end
         end
       end # if user.admin?
-      
+
     end
   end
+
+  ActiveSupport.run_load_hooks(:fat_free_crm_ability, self)
 end

data/app/models/users/authentication.rb

@@ -1,20 +1,8 @@
-# Fat Free CRM
-# Copyright (C) 2008-2011 by Michael Dvorkin
+# Copyright (c) 2008-2013 Michael Dvorkin and contributors.
 #
-# 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/>.
+# Fat Free CRM is freely distributable under the terms of MIT license.
+# See MIT-LICENSE file or http://www.opensource.org/licenses/mit-license.php
 #------------------------------------------------------------------------------
-
 class Authentication < Authlogic::Session::Base # NOTE: This is not ActiveRecord model.
   authenticate_with User
   after_save :check_if_suspended
@@ -60,5 +48,6 @@ class Authentication < Authlogic::Session::Base # NOTE: This is not ActiveRecord
   def check_if_suspended
     self.errors.add(:base, I18n.t(:msg_account_suspended)) if self.user.suspended?
   end
-end
 
+  ActiveSupport.run_load_hooks(:fat_free_crm_authentication, self)
+end

data/app/models/users/group.rb

@@ -1,3 +1,8 @@
+# Copyright (c) 2008-2013 Michael Dvorkin and contributors.
+#
+# Fat Free CRM is freely distributable under the terms of MIT license.
+# See MIT-LICENSE file or http://www.opensource.org/licenses/mit-license.php
+#------------------------------------------------------------------------------
 class Group < ActiveRecord::Base
   has_and_belongs_to_many :users
   has_many :permissions
@@ -10,4 +15,6 @@ class Group < ActiveRecord::Base
   def user_ids=(value)
     super value.join.split(',')
   end
+
+  ActiveSupport.run_load_hooks(:fat_free_crm_group, self)
 end

data/app/models/users/permission.rb

@@ -1,20 +1,8 @@
-# Fat Free CRM
-# Copyright (C) 2008-2011 by Michael Dvorkin
+# Copyright (c) 2008-2013 Michael Dvorkin and contributors.
 #
-# 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/>.
+# Fat Free CRM is freely distributable under the terms of MIT license.
+# See MIT-LICENSE file or http://www.opensource.org/licenses/mit-license.php
 #------------------------------------------------------------------------------
-
 # == Schema Information
 #
 # Table name: permissions
@@ -34,5 +22,6 @@ class Permission < ActiveRecord::Base
 
   validates_presence_of :user_id, :unless => :group_id?
   validates_presence_of :group_id, :unless => :user_id?
-end
 
+  ActiveSupport.run_load_hooks(:fat_free_crm_permission, self)
+end

data/app/models/users/preference.rb

@@ -1,20 +1,8 @@
-# Fat Free CRM
-# Copyright (C) 2008-2011 by Michael Dvorkin
+# Copyright (c) 2008-2013 Michael Dvorkin and contributors.
 #
-# 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/>.
+# Fat Free CRM is freely distributable under the terms of MIT license.
+# See MIT-LICENSE file or http://www.opensource.org/licenses/mit-license.php
 #------------------------------------------------------------------------------
-
 # == Schema Information
 #
 # Table name: preferences
@@ -58,4 +46,5 @@ class Preference < ActiveRecord::Base
     @cached_prefs ||= {}
   end
 
+  ActiveSupport.run_load_hooks(:fat_free_crm_preference, self)
 end

data/app/models/users/user.rb

@@ -1,20 +1,8 @@
-# Fat Free CRM
-# Copyright (C) 2008-2011 by Michael Dvorkin
+# Copyright (c) 2008-2013 Michael Dvorkin and contributors.
 #
-# 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/>.
+# Fat Free CRM is freely distributable under the terms of MIT license.
+# See MIT-LICENSE file or http://www.opensource.org/licenses/mit-license.php
 #------------------------------------------------------------------------------
-
 # == Schema Information
 #
 # Table name: users
@@ -59,7 +47,7 @@ class User < ActiveRecord::Base
 
   has_one     :avatar, :as => :entity, :dependent => :destroy  # Personal avatar.
   has_many    :avatars                                         # As owner who uploaded it, ex. Contact avatar.
-  has_many    :comments, :as => :commentable                   # As owner who crated a comment.
+  has_many    :comments, :as => :commentable                   # As owner who created a comment.
   has_many    :accounts
   has_many    :campaigns
   has_many    :leads
@@ -87,7 +75,8 @@ class User < ActiveRecord::Base
   }
 
   scope :have_assigned_opportunities, joins("INNER JOIN opportunities ON users.id = opportunities.assigned_to").
-                                      where("opportunities.stage <> 'lost' AND opportunities.stage <> 'won'")
+                                      where("opportunities.stage <> 'lost' AND opportunities.stage <> 'won'").
+                                      select('DISTINCT(users.id), users.*')
 
   acts_as_authentic do |c|
     c.session_class = Authentication
@@ -150,7 +139,7 @@ class User < ActiveRecord::Base
     self.single_access_token ||= update_attribute(:single_access_token, Authlogic::Random.friendly_token)
   end
 
-  # Massage value when using Chosen select box which gives values like ["", "1,2,3"] 
+  # Massage value when using Chosen select box which gives values like ["", "1,2,3"]
   #----------------------------------------------------------------------------
   def group_ids=(value)
     value = value.join.split(',').map(&:to_i) if value.map{|v| v.to_s.include?(',')}.any?
@@ -191,5 +180,7 @@ class User < ActiveRecord::Base
     end
 
   end
-  
+
+  ActiveSupport.run_load_hooks(:fat_free_crm_user, self)
+
 end

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

@@ -6,6 +6,8 @@
 
 .info= t(:admin_fields_info).html_safe
 
+.info2= t(:admin_fields_info2)
+
 .inline_tabs
   %ul
     - list_of_entities.each do |entity|

data/app/views/comments/_edit.html.haml

@@ -2,7 +2,6 @@
 .comment{:style => "margin: 5px 0px 0px 0px"}
   = link_to avatar_for(current_user, :size => :small), user_path(current_user)
   = form_for(@comment, :remote => true) do |f|
-    = hidden_field_tag "comment[user_id]", @comment.user_id || current_user.id
     = hidden_field_tag "comment[commentable_id]", commentable.id
     = hidden_field_tag "comment[commentable_type]", class_name.classify
     = f.text_area :comment, :id => dom_id(@comment, :text)

data/app/views/comments/_new.html.haml

@@ -19,7 +19,6 @@
 
   %div{ {:id => "#{id_prefix}_post"}.merge(hidden_if(true))}
     = form_for(@comment, :remote => true, :html => {:id => "#{id_prefix}_new_comment"}) do |f|
-      = hidden_field_tag "comment[user_id]", current_user.id, :id => "#{id_prefix}_comment_user_id"
       = hidden_field_tag "comment[commentable_id]", commentable.id, :id => "#{id_prefix}_comment_commentable_id"
       = hidden_field_tag "comment[commentable_type]", class_name.classify, :id => "#{id_prefix}_comment_commentable_type"
       = f.text_area :comment, :id => "#{id_prefix}_comment_comment"

data/app/views/contacts/_contacts.html.haml

@@ -1,7 +1,7 @@
 
 = section(object, :contacts)
 .list#contacts
-  - contacts = object.contacts.paginate(:page => 1, :per_page => 20)
+  - contacts = object.contacts.order('updated_at desc').paginate(:page => 1, :per_page => 20)
   = render :partial => "contacts/contact", :collection => contacts
 
 = will_paginate contacts, :id => 'contacts_pagination', :params => {:action => :contacts}

data/app/views/contacts/_sidebar_show.html.haml

@@ -20,6 +20,25 @@
 
   = web_presence_icons(@contact)
 
+  .caption #{t :contact_summary}
+  %li
+    %dt= @contact.assigned_to ? truncate(@contact.assignee.full_name, :length => 16) : nil
+    %tt #{t :assigned_to}:
+  %li
+    %dt
+      - if @contact.lead
+        = link_to(truncate(@contact.lead.name, :length => 16), @contact.lead, :title => @contact.lead.name)
+      - else
+        #{t :n_a}
+    %tt #{t :lead}:
+  %li
+    %dt
+      - if @contact.lead.try(:campaign)
+        = link_to(truncate(@contact.lead.campaign.name, :length => 16), @contact.lead.campaign, :title => @contact.lead.campaign.name)
+      - else
+        #{t :n_a}
+    %tt #{t :campaign}:
+
   - unless @contact.background_info.blank?
     .caption #{t :background_info}
     = auto_link(simple_format @contact.background_info).html_safe

data/app/views/contacts/_top_section.html.haml

@@ -1,13 +1,14 @@
+
 = hook(:contact_top_section, self, :f => f) do
   .section
     %table
       %tr
         %td
-          .label.top.req #{t :first_name}:
+          .label.top.req{ :class => "#{Setting.require_first_names ? 'req' : nil}" } #{t :first_name}:
           = f.text_field :first_name
         %td= spacer
         %td
-          .label.top{ :class => "#{Setting.require_last_names ? 'req' : ''}" } #{t :last_name}:
+          .label.top{ :class => "#{Setting.require_last_names ? 'req' : nil}" } #{t :last_name}:
           = f.text_field :last_name
       %tr
         %td

data/app/views/entities/_search.html.haml

@@ -2,11 +2,12 @@
   .tabs
     %ul
       %li
-        = link_to 'Basic Search', '#',    :"data-search-form" => "basic_search",    :class => (params[:q]  ? "" : " active")
+        = link_to t('basic_search'), '#',    :"data-search-form" => "basic_search",    :class => (params[:q]  ? "" : " active")
       %li
-        = link_to 'Advanced Search', '#', :"data-search-form" => "advanced_search", :class => (!params[:q] ? "" : " active")
-    
+        = link_to t('advanced_search'), '#', :"data-search-form" => "advanced_search", :class => (!params[:q] ? "" : " active")
+
     #search_results_count
+      = t('search_results_count', :count => @search_results_count)
 
   .search_form#basic_search{ :style => (params[:q] ? 'display: none;' : '') }
     = render "basic_search"

data/app/views/entities/contacts.js.rjs

@@ -1,3 +1,3 @@
-contacts = entity.contacts.paginate(:page => params[:page], :per_page => 20)
+contacts = entity.contacts.order('updated_at DESC').paginate(:page => params[:page], :per_page => 20)
 page['contacts'].replace_html :partial => 'contacts/contact', :collection => contacts
 page['contacts_pagination'].replace_html will_paginate(contacts, :container => false, :params => {:action => :contacts})