fat_free_crm 0.11.0 → 0.11.1

data/.gitignore

@@ -29,4 +29,5 @@ Design
 .sass-cache
 *~
 *.swp
+*.gem
 

data/.travis.yml

@@ -18,7 +18,7 @@ matrix:
       env: DB=postgres
       gemfile: Gemfile.ci
     - rvm: 1.8.7
-      env: DB=mysql
+      env: DB=sqlite
       gemfile: Gemfile.ci
     - rvm: 1.9.2
       env: DB=sqlite
@@ -29,7 +29,7 @@ matrix:
     - rvm: 1.9.3
       env: DB=mysql
       gemfile: Gemfile.ci
-    
+
 bundler_args: --path=vendor/bundle --without heroku
 
 before_script:

data/Gemfile

@@ -22,12 +22,14 @@ spec.runtime_dependencies.each do |dep|
   gem dep.name, *(dep.requirement.as_list)
 end
 
-gem 'ransack',  :git => "git://github.com/ndbroadbent/ransack.git"
+gem 'ransack',      :git => "https://github.com/fatfreecrm/ransack.git"
+gem 'chosen-rails', :git => "https://github.com/fatfreecrm/chosen-rails.git"
+gem 'responds_to_parent', :git => "https://github.com/LessonPlanet/responds_to_parent.git"
 
 # Remove fat_free_crm from dependencies, to stop it from being auto-required.
 remove 'fat_free_crm'
 
-gem 'pg', '~> 0.12.2'
+gem 'pg', '~> 0.13.2'
 
 group :development, :test do
   gem 'rspec-rails'
@@ -38,3 +40,14 @@ group :development, :test do
     gem 'ruby-debug19', :platform => :mri_19
   end
 end
+
+
+# Gems used only for assets and not required
+# in production environments by default.
+group :assets do
+  gem 'sass-rails',   '~> 3.2.3'
+  gem 'coffee-rails', '~> 3.2.1'
+  gem 'therubyracer', :platform => :ruby  # C Ruby (MRI) or Rubinius, but NOT Windows
+  gem 'uglifier',     '>= 1.0.3'
+end
+

data/Gemfile.lock

@@ -1,5 +1,19 @@
 GIT
-  remote: git://github.com/ndbroadbent/ransack.git
+  remote: https://github.com/LessonPlanet/responds_to_parent.git
+  revision: 1f0c6d82eda5e7f331a30fc029e7ead2a7dbdebf
+  specs:
+    responds_to_parent (1.0.20091013)
+
+GIT
+  remote: https://github.com/fatfreecrm/chosen-rails.git
+  revision: 33c92a8554ee14d11b7293eb531371a05c0a0b67
+  specs:
+    chosen-rails (0.9.5)
+      railties (~> 3.0)
+      thor (~> 0.14)
+
+GIT
+  remote: https://github.com/fatfreecrm/ransack.git
   revision: 92f5812d4320e5f1959f844d19d0386bb5654a08
   specs:
     ransack (0.6.0)
@@ -56,6 +70,7 @@ GEM
       activerecord (>= 3.0.7)
       activerecord (>= 3.0.7)
     builder (3.0.0)
+    cancan (1.6.7)
     capybara (1.1.2)
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
@@ -65,9 +80,6 @@ GEM
       xpath (~> 0.1.4)
     childprocess (0.3.1)
       ffi (~> 1.0.6)
-    chosen-rails (0.9.7.1)
-      railties (~> 3.0)
-      thor (~> 0.14)
     chronic (0.6.7)
     cocaine (0.2.1)
     coffee-rails (3.2.2)
@@ -80,11 +92,15 @@ GEM
     columnize (0.3.6)
     database_cleaner (0.7.1)
     diff-lcs (1.1.3)
+    dynamic_form (1.1.4)
     erubis (2.7.0)
     execjs (1.3.0)
       multi_json (~> 1.0)
     factory_girl (2.6.1)
       activesupport (>= 2.3.9)
+    factory_girl_rails (1.7.0)
+      factory_girl (~> 2.6.0)
+      railties (>= 3.0.0)
     ffaker (1.13.0)
     ffi (1.0.11)
     fuubar (1.0.0)
@@ -114,12 +130,12 @@ GEM
     nokogiri (1.5.0)
     paper_trail (2.6.0)
       rails (~> 3)
-    paperclip (2.5.2)
+    paperclip (2.7.0)
       activerecord (>= 2.3.0)
       activesupport (>= 2.3.2)
       cocaine (>= 0.0.2)
       mime-types
-    pg (0.12.2)
+    pg (0.13.2)
     polyamorous (0.5.0)
       activerecord (~> 3.0)
     polyglot (0.3.3)
@@ -192,7 +208,7 @@ GEM
       ffi (~> 1.0)
       multi_json (~> 1.0)
       rubyzip
-    simple_form (1.5.2)
+    simple_form (2.0.1)
       actionpack (~> 3.0)
       activemodel (~> 3.0)
     spork (0.9.0)
@@ -227,30 +243,34 @@ DEPENDENCIES
   acts_as_list (~> 0.1.4)
   ajax-chosen-rails (>= 0.1.5)
   authlogic (~> 3.1.0)
+  cancan
   capybara
-  chosen-rails
-  coffee-rails
+  chosen-rails!
+  coffee-rails (~> 3.2.1)
   database_cleaner
+  dynamic_form
   factory_girl (~> 2.6.1)
+  factory_girl_rails (~> 1.7.0)
   ffaker (>= 1.12.0)
   fuubar
   haml (~> 3.1.3)
   headless
   jquery-rails
   paper_trail
-  paperclip (~> 2.5.2)
-  pg (~> 0.12.2)
+  paperclip (~> 2.7.0)
+  pg (~> 0.13.2)
   prototype-rails
   rails (~> 3.2.2)
   ransack!
+  responds_to_parent!
   rspec-rails
   ruby-debug
   ruby-debug19
   sass (~> 3.1.15)
-  sass-rails
-  simple_form (~> 1.5.2)
+  sass-rails (~> 3.2.3)
+  simple_form (~> 2.0.1)
   spork
   steak
   therubyracer
-  uglifier
+  uglifier (>= 1.0.3)
   will_paginate (~> 3.0.2)

data/README.md

@@ -58,159 +58,72 @@ Pull requests and bug reports are always welcome!
 * MySQL v4.1.1 or later (v5+ is recommended), SQLite v3.4 or later, or Postgres 8.4.8 or later.
 * ImageMagick (optional, only needed if you would like to use avatars)
 
-(Ruby on Rails v3 and other gem dependencies will be installed automatically by Bundler.)
+(Ruby on Rails and other gem dependencies will be installed automatically by Bundler.)
 
 
 ### Downloads
 
-* Git source code repository: git://github.com/fatfreecrm/fat_free_crm.git
-* .zip or .tgz archives: http://github.com/fatfreecrm/fat_free_crm/downloads
+* Git source code repository: `git clone git://github.com/fatfreecrm/fat_free_crm.git`
+* **.zip** or **.tgz** archives: http://github.com/fatfreecrm/fat_free_crm/downloads
 
 
-### Upgrading from previous versions of Fat Free CRM
+## Installation
 
-If you are upgrading from version 0.10.1 or below to the latest Rails 3.x version, your database schema
-needs to be updated.
-
-Please run the following commands in this order:
-
-```bash
-bundle install --without heroku   # Installs gem dependencies
-rake ffcrm:upgrade:schema         # Updates your schema to use the new timestamped migrations
-rake db:migrate                   # Runs any new database migrations.
-```
+Please view one of the following installation guides:
 
-## Install on Heroku
+### [Setup Linux or Mac OS](http://guides.fatfreecrm.com/Setup-Linux-or-Mac-OS.html)
 
-You will need the heroku gem on your system.
+Installing Fat Free CRM on Linux or Mac OS X
 
-```bash
-gem install heroku
-```
+### [Setup Heroku](http://guides.fatfreecrm.com/Setup-Heroku.html)
 
-To set up Fat Free CRM on Heroku, run the following commands:
+Setting up a Heroku instance for Fat Free CRM
 
-```bash
-app_name="{{organization-crm}}" # <- Replace with your desired application name
-cp config/settings.yml.example config/settings.yml
-git add -f config/settings.yml
-git commit -m "Added default settings.yml"
-heroku create $app_name --stack cedar
-git push heroku master
-heroku run rake ffcrm:setup USERNAME=admin PASSWORD=admin EMAIL=admin@example.com
-heroku config:add HEROKU=true
-```
+### [Setup Microsoft Windows](http://guides.fatfreecrm.com/Setup-Microsoft-Windows.html)
 
-## Install locally, or on a server
+Installing Fat Free CRM on Microsoft Windows
 
-#### Set Up Configuration (Database & Settings)
+### [Ubuntu Server Setup Script](http://guides.fatfreecrm.com/Ubuntu-Server-Setup-Script.html)
 
-Fat Free CRM supports PostGreSQL, MySQL and SQLite databases. The source code comes with
-sample database configuration files, such as: <tt>config/database.mysql.yml</tt>
-for MySQL and <tt>config/database.sqlite.yml</tt> for SQLite.
+Run this bash script to quickly setup a Ubuntu server
 
-Based on your choice of database, create <tt>config/database.yml</tt>:
+### [Running Fat Free CRM as a Rails Engine](http://guides.fatfreecrm.com/Running-as-a-Rails-Engine.html)
 
-```bash
-cp config/database.mysql.yml config/database.yml
-```
+Run the Fat Free CRM gem within a separate Rails application.
+This is the best way to deploy Fat Free CRM if you need to add plugins or make any customizations.
 
-* Edit <tt>config/database.yml</tt> and specify database names and authentication details.
 
-* Then, edit your <tt>Gemfile</tt> and uncomment only your chosen database.
+## Upgrading from previous versions of Fat Free CRM
 
+If you are upgrading from version 0.10.1 or below to the latest Rails 3.x version, your database schema
+needs to be updated.
 
-#### Install Gem Dependencies
-
-After you have uncommented the right database adapter in your <tt>Gemfile</tt>,
-run the following command from the application's root directory:
-
-```bash
-bundle install --without heroku
-```
-
-#### Create Database
-
-Now you are ready to create the database:
-
-```bash
-rake db:create
-```
-
-#### Set Up Application
-
-The next step is to load default Fat Free CRM settings, such as menu structures,
-default colors, etc. and create the Admin user.
-
-Using the provided sample, create your <tt>config/settings.yml</tt>:
-
-```bash
-cp config/settings.yml.example config/settings.yml
-```
-
-* Edit <tt>config/settings.yml</tt> and configure any required settings, such as your host, base URL and language (locale).
-
-
-Next, run the following rake task:
-
-```bash
-rake ffcrm:setup
-```
-
-The previous command will prompt you for an admin user, password and email.
-If you want to run this task without any user input, you can set the following variables:
-
-```bash
-rake ffcrm:setup USERNAME=admin PASSWORD=password EMAIL=admin@example.com
-```
-
-#### Load Demo Data (Optional)
-
-You can test drive Fat Free CRM by loading sample records that are generated
-on the fly mimic the actual use.
-
-**IMPORTANT**: Loading demo will delete all existing data from your database.
-
-```bash
-rake ffcrm:demo:load
-```
-
-Among other things the demo generator creates 8 sample user records with the
-following usernames: <tt>aaron</tt>, <tt>ben</tt>, <tt>cindy</tt>, <tt>dan</tt>,
-<tt>elizabeth</tt>, <tt>frank</tt>, <tt>george</tt>, and <tt>heather</tt>.
-You can log in with any of these names using the name as password.
-The demo site at http://demo.fatfreecrm.com provides access as a sample user as well.
-
-You can reset the database and reload demo data at any time by using:
+Please run the following commands in this order:
 
 ```bash
-rake ffcrm:demo:reload
+bundle install --without heroku   # Installs gem dependencies
+rake ffcrm:upgrade:schema         # Updates your schema to use the new timestamped migrations
+rake db:migrate                   # Runs any new database migrations.
 ```
 
-#### Run the App
-
-Now you should be able to launch the Rails server and point your web browser
-to http://localhost:3000
 
-```bash
-rails server
-```
-
-# Resources
+## Resources
 
 |||
 |-----------------------------------:|:--------------------------|
-|                 **Home page**: | http://www.fatfreecrm.com |
-|               **Online demo**: | http://demo.fatfreecrm.com |
-|              **Project page**: | http://github.com/michaeldv/fat_free_crm/tree/master |
-|         **Features and bugs**: | http://fatfreecrm.lighthouseapp.com |
-|    **Twitter commit updates**: | http://twitter.com/fatfreecrm |
-|       **User's Google group**: | http://groups.google.com/group/fat-free-crm-users |
-|  **Developer's Google group**: | http://groups.google.com/group/fat-free-crm-dev |
-|               **IRC channel**: | [#fatfreecrm](http://webchat.freenode.net/) on irc.freenode.net |
-
-
-# For Developers
+|                 **Home Page**: | http://www.fatfreecrm.com |
+|                    **Guides**: | http://guides.fatfreecrm.com |
+|               **Online Demo**: | http://demo.fatfreecrm.com |
+|       **Github Project Page**: | http://github.com/fatfreecrm/fat_free_crm |
+| **Feature Requests and Bugs**: | http://support.fatfreecrm.com/ |
+|                  **RDoc API**: | http://api.fatfreecrm.com |
+|    **Twitter Commit Updates**: | http://twitter.com/fatfreecrm |
+|       **User's Google Group**: | http://groups.google.com/group/fat-free-crm-users |
+|  **Developer's Google Group**: | http://groups.google.com/group/fat-free-crm-dev |
+|               **IRC Channel**: | [#fatfreecrm](http://webchat.freenode.net/) on irc.freenode.net |
+
+
+## For Developers
 
 Fat Free CRM can be customized by implementing callback hooks and extended by
 creating Rails Engines plugins. Check out these sample repositories demonstrating

data/app/assets/javascripts/application.js.erb

@@ -33,7 +33,7 @@
 //= require crm_chosen
 //= require search
 //= require lists
-
+//= require_self
 
 <%
 Gem.loaded_specs.keys.grep(/^ffcrm_/).each do |plugin|

data/app/assets/javascripts/crm.js

@@ -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/>.
+//------------------------------------------------------------------------------
+
 var crm = {
 
   EXPANDED      : "&#9660;",
@@ -152,8 +169,12 @@ var crm = {
     $("account_disabled_title").show();
     $("account_name").hide();
     $("account_name").disable();
+    // Disable chosen account select
     $("account_id").disable();
+    Event.fire($("account_id"), "liszt:updated");
     $("account_id_chzn").show();
+    // Enable hidden account id select so that value is POSTed
+    $("account_id").enable();
   },
 
   //----------------------------------------------------------------------------
@@ -450,7 +471,7 @@ document.observe("dom:loaded", function() {
 
   if (container) {
     var img = new Image;
-    img.src = '/assets/loading.gif';
+    img.src = crm.base_url + '/assets/loading.gif';
 
     function createSpinner() {
       return new Element('img', { src: img.src, 'class': 'spinner' })

data/app/assets/javascripts/crm_fields.js

@@ -15,11 +15,10 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //------------------------------------------------------------------------------
 
-
 //----------------------------------------------------------------------------
 // AJAX loads the form fields for each field group
 crm.load_field_group = function(controller, tag, asset_id) {
-  new Ajax.Request('/'+ controller +'/field_group', {
+  new Ajax.Request(crm.base_url + '/' + controller +'/field_group', {
     asynchronous: true,
     evalScripts: true,
     method: 'get',
@@ -44,4 +43,4 @@ crm.close_all_forms = function() {
   $$('.close').each(function(el){
     new Ajax.Request(el.href, {asynchronous: true, method: "get"})
   });
-};
+};

data/app/assets/javascripts/jquery-noconflict.js

@@ -1 +1,18 @@
+// 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/>.
+//------------------------------------------------------------------------------
+
 jQuery.noConflict();