fat_free_crm 0.11.3 → 0.11.4

data/app/models/users/ability.rb

@@ -8,13 +8,34 @@ class Ability
       entities = [Account, Campaign, Contact, Lead, Opportunity]
 
       can :create, :all
+      can :read, [User] # for search autocomplete
       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
+      # activate the issue referred to above.
+      #
+      if user.admin?
+        can :manage, :all
+      else
+        # Group or User permissions
+        t = Permission.arel_table
+        scope = t[:user_id].eq(user.id)
 
-      entities.each do |klass|
-        permissions = user.permissions.where(:asset_type => klass.name)
-        can :manage, klass, :id => permissions.map(&:asset_id)
-      end
+        if (group_ids = user.group_ids).any?
+          scope = scope.or(t[:group_id].eq_any(group_ids))
+        end
+
+        entities.each do |klass|
+          if (asset_ids = Permission.where(scope.and(t[:asset_type].eq(klass.name))).value_of(:asset_id)).any?
+            can :manage, klass, :id => asset_ids
+          end
+        end
+      end # if user.admin?
+      
     end
   end
 end

data/app/models/users/group.rb

@@ -0,0 +1,13 @@
+class Group < ActiveRecord::Base
+  has_and_belongs_to_many :users
+  has_many :permissions
+
+  attr_accessible :name, :user_ids
+
+  validates :name, :presence => true, :uniqueness => true
+
+  # TODO: Fix chosen bug that makes this necessary
+  def user_ids=(value)
+    super value.join.split(',')
+  end
+end

data/app/models/users/permission.rb

@@ -29,8 +29,10 @@
 
 class Permission < ActiveRecord::Base
   belongs_to :user
+  belongs_to :group
   belongs_to :asset, :polymorphic => true
 
-  validates_presence_of :user_id
+  validates_presence_of :user_id, :unless => :group_id?
+  validates_presence_of :group_id, :unless => :user_id?
 end
 

data/app/models/users/preference.rb

@@ -36,7 +36,7 @@ class Preference < ActiveRecord::Base
     return super(name) if name.to_s == "user_id" # get the value of belongs_to
 
     return cached_prefs[name.to_s] if cached_prefs.has_key?(name.to_s)
-    cached_prefs[name.to_s] = if (pref = Preference.find_by_name_and_user_id(name.to_s, self.user.id))
+    cached_prefs[name.to_s] = if (self.user.present? && pref = Preference.find_by_name_and_user_id(name.to_s, self.user.id))
       Marshal.load(Base64.decode64(pref.value))
     end
   end
@@ -59,4 +59,3 @@ class Preference < ActiveRecord::Base
   end
 
 end
-

data/app/models/users/user.rb

@@ -65,8 +65,10 @@ class User < ActiveRecord::Base
   has_many    :leads
   has_many    :contacts
   has_many    :opportunities
+  has_many    :assigned_opportunities, :class_name => 'Opportunity', :foreign_key => 'assigned_to'
   has_many    :permissions, :dependent => :destroy
   has_many    :preferences, :dependent => :destroy
+  has_and_belongs_to_many :groups
 
   has_paper_trail :ignore => [:last_request_at, :perishable_token]
 
@@ -77,14 +79,16 @@ class User < ActiveRecord::Base
 
   scope :text_search, lambda { |query|
     query = query.gsub(/[^\w\s\-\.'\p{L}]/u, '').strip
-    where('upper(username) LIKE upper(:s) OR upper(first_name) LIKE upper(:s) OR upper(last_name) LIKE upper(:s)', :s => "#{query}%")
+    where('upper(username) LIKE upper(:s) OR upper(first_name) LIKE upper(:s) OR upper(last_name) LIKE upper(:s)', :s => "%#{query}%")
   }
 
   scope :my, lambda {
-    current_ability = Ability.new(User.current_user)
-    accessible_by(current_ability)
+    accessible_by(User.current_ability)
   }
 
+  scope :have_assigned_opportunities, joins("INNER JOIN opportunities ON users.id = opportunities.assigned_to").
+                                      where("opportunities.stage <> 'lost' AND opportunities.stage <> 'won'")
+
   acts_as_authentic do |c|
     c.session_class = Authentication
     c.validates_uniqueness_of_login_field_options = { :message => :username_taken }
@@ -146,6 +150,13 @@ 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"] 
+  #----------------------------------------------------------------------------
+  def group_ids=(value)
+    value = value.join.split(',').map(&:to_i) if value.map{|v| v.to_s.include?(',')}.any?
+    super(value)
+  end
+
   private
 
   # Suspend newly created user if signup requires an approval.
@@ -170,4 +181,15 @@ class User < ActiveRecord::Base
     end
     artifacts == 0
   end
+
+  # Define class methods
+  #----------------------------------------------------------------------------
+  class << self
+
+    def current_ability
+      Ability.new(User.current_user)
+    end
+
+  end
+  
 end

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

@@ -1,39 +1,5 @@
-- amount = account.opportunities.pipeline.map(&:weighted_amount).sum
-%li.highlight[account]
-  - if account.category
-    .strip{:class => account.category} #{t(account.category)}
-  - else
-    .strip{:style => "color: gray;"} #{t :other}
-
-  %ul.tools
-    = hook(:account_tools_before, self, :account => account)
-
-    - if can?(:update, account)
-      %li= link_to_edit(account)
-
-    - if can?(:destroy, account)
-      %li= link_to_delete(account)
-
-  .indent
-    = link_to(account.name, account)
-    - if amount != 0.0
-      %span.amount= number_to_currency(amount, :precision => 0)
-    –
-    %tt
-      = account.location << ", " unless account.location.blank?
-      = t(:added_by, :time_ago => time_ago_in_words(account.created_at), :user => (account.user.id == @current_user.id ? t(:me) : account.user.full_name)) << " | "
-      = t('pluralize.contact', account.contacts.count) << " | "
-      = t('pluralize.opportunity', account.opportunities.count)
-
-    - unless @current_user.preference[:accounts_outline] == "brief"
-      %dt
-        = stars_for(account)
-        = " | ".html_safe << link_to(account.website, account.website.to_url) if account.website.present?
-        = " | ".html_safe << link_to_email(account.email) if account.email.present?
-        = " | ".html_safe << t(:phone_small) << ": " << (account.toll_free_phone? ? account.toll_free_phone : account.phone) if account.toll_free_phone? || account.phone?
-
-      - if account.tag_list.present?
-        %dt
-          .tags= tags_for_index(account)
-
-      = hook(:account_bottom, self, :account => account)
+- if (params['controller'] == 'accounts') and (template = template_for_current_view).present?
+  = render(template, :account => account)
+- else
+  -# default view
+  = render 'accounts/index_brief', :account => account

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

@@ -6,9 +6,10 @@
     = f.error_messages :object_name => t('account')
 
     = render "accounts/top_section",  :f => f, :edit => true
+    = render "fields/edit_custom_field_group", :f => f, :edit => true
     = render "accounts/contact_info", :f => f, :edit => true
-    = render "fields/groups",  :f => f, :edit => true
-    = render "accounts/permissions",  :f => f, :edit => true
+    = render "fields/groups",         :f => f, :edit => true
+    = render "entities/permissions",  :f => f, :edit => true, :entity => @account
 
     .buttonbar
       - if Setting.compound_address

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

@@ -0,0 +1,32 @@
+- amount = account.opportunities.pipeline.map(&:weighted_amount).sum
+%li.highlight[account]
+  - if account.category
+    .strip{:class => account.category} #{t(account.category)}
+  - else
+    .strip{:style => "color: gray;"} #{t :other}
+
+  %ul.tools
+    = hook(:account_tools_before, self, :account => account)
+
+    - if can?(:update, account)
+      %li= link_to_edit(account)
+
+    - if can?(:destroy, account)
+      %li= link_to_delete(account)
+
+  .indent
+    = link_to(account.name, account)
+    - if amount != 0.0
+      %span.amount= number_to_currency(amount, :precision => 0)
+    –
+    %tt
+      = account.location << ", " unless account.location.blank?
+      - user_name = account.user_id == current_user.id ? t(:me) : account.user.try(:full_name)
+      - if user_name
+        = t(:added_by, :time_ago => time_ago_in_words(account.created_at), :user => user_name) << " | "
+      - else
+        = t(:added_ago, :value => time_ago_in_words(account.created_at)) << " | "
+      = t('pluralize.contact', account.contacts.count) << " | "
+      = t('pluralize.opportunity', account.opportunities.count)
+
+    = hook(:account_bottom, self, :account => account)

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

@@ -0,0 +1,42 @@
+- amount = account.opportunities.pipeline.map(&:weighted_amount).sum
+%li.highlight[account]
+  - if account.category
+    .strip{:class => account.category} #{t(account.category)}
+  - else
+    .strip{:style => "color: gray;"} #{t :other}
+
+  %ul.tools
+    = hook(:account_tools_before, self, :account => account)
+
+    - if can?(:update, account)
+      %li= link_to_edit(account)
+
+    - if can?(:destroy, account)
+      %li= link_to_delete(account)
+
+  .indent
+    = link_to(account.name, account)
+    - if amount != 0.0
+      %span.amount= number_to_currency(amount, :precision => 0)
+    –
+    %tt
+      = account.location << ", " unless account.location.blank?
+      - user_name = account.user_id == current_user.id ? t(:me) : account.user.try(:full_name)
+      - if user_name
+        = t(:added_by, :time_ago => time_ago_in_words(account.created_at), :user => user_name) << " | "
+      - else
+        = t(:added_ago, :value => time_ago_in_words(account.created_at)) << " | "
+      = t('pluralize.contact', account.contacts.count) << " | "
+      = t('pluralize.opportunity', account.opportunities.count)
+
+    %dt
+      = stars_for(account)
+      = " | ".html_safe << link_to(account.website, account.website.to_url) if account.website.present?
+      = " | ".html_safe << link_to_email(account.email) if account.email.present?
+      = " | ".html_safe << t(:phone_small) << ": " << (account.toll_free_phone? ? account.toll_free_phone : account.phone) if account.toll_free_phone? || account.phone?
+
+    - if account.tag_list.present?
+      %dt
+        .tags= tags_for_index(account)
+
+    = hook(:account_bottom, self, :account => account)

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

@@ -5,9 +5,11 @@
   = f.error_messages :object_name => t('account')
 
   = render "accounts/top_section",  :f => f
+  = render "fields/edit_custom_field_group", :f => f
+  = render "shared/add_comment", :f => f
   = render "accounts/contact_info", :f => f
   = render "fields/groups",  :f => f
-  = render "accounts/permissions",  :f => f
+  = render "entities/permissions",  :f => f, :entity => @account
 
   .buttonbar
     - if Setting.compound_address
@@ -16,4 +18,3 @@
       = f.submit t(:create_account)
     #{t :or}
     = link_to_cancel new_account_path
-

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

@@ -1,17 +1,16 @@
 .filters#filters
-  = render "shared/search"
-  = hook(:index_account_sidebar_bottom, self)
+  .caption= t :account_categories
   - Setting.account_category.each do |key|
     .check_box{:style => "border-bottom: 1px silver dotted;"}
       %div{:style => "float:right;"}
         = @account_category_total[key]
-      = account_category_checbox(key, @account_category_total[key])
+      = account_category_checkbox(key, @account_category_total[key])
       = label_tag(key, t(key))
 
   .check_box{:style => "border-bottom: 1px silver dotted;"}
     %div{:style => "float:right;"}
       = @account_category_total[:other]
-    = account_category_checbox("other", @account_category_total[:other])
+    = account_category_checkbox("other", @account_category_total[:other])
     = label_tag(:other, t(:other))
 
   .check_box

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

@@ -40,8 +40,8 @@
   %li
     %span{:style => "float:right;"}= stars_for(@account)
     %tt #{t :rating}:
-  %li.last
-    %dt= truncate((@account.assigned_to ? @account.assignee.full_name : @account.user.full_name), :length => 16)
+  %li
+    %dt= @account.assigned_to ? truncate(@account.assignee.full_name, :length => 16) : nil
     %tt #{t :assigned_to}:
 
   - unless @account.background_info.blank?

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

@@ -0,0 +1,11 @@
+#confirm{ hidden }
+.title_tools#menu
+  = link_to_inline(:edit_account, edit_account_path(@account), :text => t(:edit)) + " | "
+  = link_to_function(t(:delete) + '?', confirm_delete(@account))
+.title_tools#buttons
+  = view_buttons
+.title#edit_account_title
+  = h(@account.name)
+  = image_tag("loading.gif", :size => :thumb, :id => "loading", :style => "display: none;")
+
+%div#edit_account{ hidden }

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

@@ -8,7 +8,7 @@
       %tr
         %td
           .label #{t :assigned_to}:
-          = user_select(:account)
+          = user_select(:account, User.except(current_user), current_user)
         %td= spacer
         %td
           .label #{t :category}:

data/app/views/accounts/create.js.rjs

@@ -5,11 +5,10 @@ if @account.valid?
   page.insert_html :top, :accounts, :partial => "account", :collection => [ @account ]
   page[dom_id(@account)].visual_effect :highlight, :duration => 1.5
   page << refresh_sidebar(:index, :filters)
-  page[:paginate].replace_html :partial => "shared/paginate"
+  page[:paginate].replace_html :partial => "shared/paginate_with_per_page"
   page.call "crm.flick", :empty, :remove
 else
   page[:create_account].replace_html :partial => "new"
-  page.call "crm.init_chosen_fields"
   page[:create_account].visual_effect :shake, :duration => 0.25, :distance => 6
   page[:account_name].focus
 end

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

@@ -1,3 +1,3 @@
 page[dom_id(@account)].visual_effect :blind_up, :duration => 0.25
 page << refresh_sidebar(:index, :filters)
-page[:paginate].replace_html :partial => "shared/paginate"
+page[:paginate].replace_html :partial => "shared/paginate_with_per_page"

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

@@ -22,11 +22,9 @@ else # <----------------------------------------  Show [Edit Account] form.
     page.call "crm.highlight_off", id             # Disable onMouseOver for the list item.
     page.call "crm.hide_form", :create_account    # Hide [Create Account] form if any.
     page[id].replace_html :partial => "edit"      # Show [Edit Account] form.
-    page.call "crm.init_chosen_fields"
 
   elsif params[:cancel].false?                    # Called from title of the account landing page...
     page[:edit_account].replace_html :partial => "edit"
-    page.call "crm.init_chosen_fields"
     page.call "crm.flip_form", :edit_account
     page.call "crm.set_title", :edit_account, "#{t :edit} #{@account.name}"
   end

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

@@ -1,25 +1,18 @@
 = styles_for :account
 
-.title_tools
-  = link_to_inline(:create_account, new_account_path, :text => t(:create_account)) << " | "
-  - if Setting.advanced_search_enabled
-    = link_to_inline(:advanced_search, advanced_search_accounts_path, :text => t(:advanced_search)) << " | "
-  = link_to_inline(:options, options_accounts_path, :text=> t(:options))
+= render 'entities/title_bar'
 
-.title
-  %span#create_account_title #{t :accounts}
-  = image_tag("loading.gif", :size => :thumb, :id => "loading", :style => "display: none;")
-.remote#options{ hidden }
-.remote#advanced_search{ hidden_if(!params[:q]) }
-  - if params[:q]
-    = render :partial => "advanced_search"
 .remote#create_account{ hidden }
 
+= render 'search'
+
+.remote#options{ hidden }
+
 .list#accounts
   - if @accounts.any?
     = render @accounts
   - else
     = render "shared/empty"
 
-#paginate= render "shared/paginate"
+#paginate= render "shared/paginate_with_per_page"
 #export= render "shared/export"

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

@@ -3,4 +3,6 @@ if @accounts.any?
 else
   page[:accounts].replace_html :partial => "shared/empty"
 end
-page[:paginate].replace_html :partial => "shared/paginate"
+page[:paginate].replace_html :partial => "shared/paginate_with_per_page"
+page[:export].replace_html :partial => "shared/export"
+page[:search_results_count].replace_html :text => t('search_results_count', :count => @search_results_count)

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

@@ -0,0 +1,82 @@
+xml.Worksheet 'ss:Name' => I18n.t(:tab_accounts) do
+  xml.Table do
+    unless @accounts.empty?
+      # Header.
+      xml.Row do
+        heads = [I18n.t('user'),
+                 I18n.t('assigned_to'),
+                 I18n.t('name'),
+                 I18n.t('email'),
+                 I18n.t('phone'),
+                 I18n.t('fax'),
+                 I18n.t('website'),
+                 I18n.t('background_info'),
+                 I18n.t('access'),
+                 I18n.t('phone_toll_free'),
+                 I18n.t('rating'),
+                 I18n.t('category'),
+                 I18n.t('date_created'),
+                 I18n.t('date_updated'),
+                 I18n.t('street1'),
+                 I18n.t('street2'),
+                 I18n.t('city'),
+                 I18n.t('state'),
+                 I18n.t('zipcode'),
+                 I18n.t('country'),
+                 I18n.t('address')]
+        
+        # Append custom field labels to header
+        Account.fields.each do |field|
+          heads << field.label
+        end
+        
+        heads.each do |head|
+          xml.Cell do
+            xml.Data head,
+                     'ss:Type' => 'String'
+          end
+        end
+      end
+      
+      # Account rows.
+      @accounts.each do |account|
+        xml.Row do
+          address = account.billing_address
+          data    = [account.user.try(:name),
+                     account.assignee.try(:name),
+                     account.name,
+                     account.email,
+                     account.phone,
+                     account.fax,
+                     account.website,
+                     account.background_info,
+                     account.access,
+                     account.toll_free_phone,
+                     account.rating,
+                     account.category,
+                     account.created_at,
+                     account.updated_at,
+                     address.try(:street1),
+                     address.try(:street2),
+                     address.try(:city),
+                     address.try(:state),
+                     address.try(:zipcode),
+                     address.try(:country),
+                     address.try(:full_address)]
+                     
+          # Append custom field values.
+          Account.fields.each do |field|
+            data << account.send(field.name)
+          end
+          
+          data.each do |value|
+            xml.Cell do
+              xml.Data value,
+                       'ss:Type' => "#{value.respond_to?(:abs) ? 'Number' : 'String'}"
+            end
+          end
+        end
+      end
+    end
+  end
+end