fat_free_crm 0.11.1 → 0.11.2

data/Procfile

@@ -1 +1 @@
-web: bundle exec unicorn -p $PORT -c config/unicorn.rb
+web: ./bin/unicorn -p $PORT -c config/unicorn.rb

data/README.md

@@ -1,6 +1,6 @@
 # Fat Free CRM
 
-[![TravisCI][travis-img]][travis-ci] [![Dependency Status][gemnasium-img]][gemnasium]
+[![TravisCI][travis-img]][travis-ci]
 
 [travis-img]: https://secure.travis-ci.org/fatfreecrm/fat_free_crm.png?branch=master
 [travis-ci]: http://travis-ci.org/fatfreecrm/fat_free_crm

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

@@ -16,6 +16,7 @@
 //------------------------------------------------------------------------------
 
 //= require jquery
+//= require jquery-ui
 //= require jquery-noconflict
 //= require prototype
 //= require effects
@@ -27,6 +28,8 @@
 //= require crm_classes
 //= require crm_loginout
 //= require crm_fields
+//= require textarea_autocomplete
+//= require crm_textarea_autocomplete
 //= require calendar_date_select/calendar_date_select
 //= require event.simulate
 //= require ajax-chosen-prototype

data/app/assets/javascripts/crm_textarea_autocomplete.js

@@ -0,0 +1,44 @@
+// 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/>.
+//------------------------------------------------------------------------------
+
+crm.textarea_user_autocomplete = function(el_id) {
+  if (! jQuery('#areacomplete_' + el_id)[0]) {
+    jQuery('#' + el_id).areacomplete({
+      wordCount: 1,
+      mode: "outter",
+      on: {
+        query: function(text,cb) {
+          // Only autocomplete if search term starts with '@'
+          if (text.indexOf("@") != 0) { return []; }
+
+          var words = [];
+          for( var i=0; i < _ffcrm_users.length; i++ ) {
+            var name_query = text.replace("@",'').toLowerCase();
+            if (_ffcrm_users[i].toLowerCase().indexOf(name_query) != -1 ) {
+              words.push(_ffcrm_users[i]);
+            }
+          }
+          cb(words, text.replace("@",''));
+        },
+        selected: function(text, data) {
+          var username_regEx = new RegExp("\\((@[^)]+)\\)");
+          return text.match(username_regEx)[1];
+        }
+      }
+    });
+  }
+}

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

@@ -18,6 +18,7 @@
  */
 
 /*
+ *= require jquery-ui.custom
  *= require modalbox
  *= require facebooklist
  *= require rails
@@ -28,6 +29,7 @@
  *= require chosen
  *= require ffcrm_chosen
  *= require fields
+ *= require textarea_autocomplete
  *= require_self
  */
 

data/app/assets/stylesheets/common.scss

@@ -335,7 +335,12 @@ $sidebar_width: 210px;
     padding: 0px;
     margin: -10px 0px 0px 36px;
     p {
-      margin: 10px 0px 0px 0px; } } }
+      margin: 10px 0px 0px 0px; } }
+  .comment_subscriptions {
+    margin-top: 7px;
+    margin-left: 4px;
+    a {
+      font-size: 11px; } } }
 
 // Avoid collision with .email CSS class which is used to display Task category strip.
 .mail {
@@ -435,16 +440,7 @@ $sidebar_width: 210px;
     dt {
       color: #3f3f3f;
       font-size: 11px;
-      padding: 2px 0px 0px 0px; }
-    dt a:link, dt a:visited {
-      color: #3f3f3f;
-      font-weight: bold;
-      text-decoration: none; }
-    dt a:hover {
-      background: dimgray;
-      color: white;
-      font-weight: bold;
-      text-decoration: none; } } }
+      padding: 2px 0px 0px 0px; } } }
 
 // Sidebar, filters, and selectors.
 //------------------------------------------------------------------------------

data/app/assets/stylesheets/textarea_autocomplete.scss

@@ -0,0 +1,42 @@
+.areacomplete-dropdown {
+  ul.auto-list {
+    display: none;
+    position: absolute;
+    top: 0px;
+    left: 0px;
+    background: white;
+    padding: 0;
+    margin: 0 4px 4px 0;
+    list-style:none;
+    overflow-x: hidden;
+    overflow-y: auto;
+    max-height: 230px;
+    border: 1px solid #AAA;
+    -webkit-border-radius: 0 0 4px 4px;
+    -moz-border-radius: 0 0 4px 4px;
+    border-radius: 0 0 4px 4px;
+    -moz-background-clip: padding;
+    -webkit-background-clip: padding-box;
+    background-clip: padding-box;
+    font-family: "Lucida Grande", Geneva, Arial, Helvetica, sans-serif;
+  }
+
+  ul.auto-list > li:hover, ul.auto-list > li[data-selected=true] {
+    background: #3875D7;
+    color: white;
+    em{
+      background: inherit;
+    }
+  }
+
+  ul.auto-list > li {
+    line-height: 15px;
+    padding: 4px 7px 4px;
+    border-bottom: none;
+  }
+
+  em{
+    background: #FEFFDE;
+    font-style: normal;
+  }
+}

data/app/controllers/admin/application_controller.rb

@@ -15,10 +15,10 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #------------------------------------------------------------------------------
 
-class Admin::ApplicationController < EntitiesController
-  layout "admin/application"
+class Admin::ApplicationController < ApplicationController
   before_filter :require_admin_user
 
+  layout "admin/application"
   helper "admin/field_groups"
 
   # Autocomplete handler for all admin controllers.
@@ -26,10 +26,11 @@ class Admin::ApplicationController < EntitiesController
   def auto_complete
     @query = params[:auto_complete_query]
     @auto_complete = klass.text_search(@query).limit(10)
-    render "shared/auto_complete", :layout => nil
+    render :partial => 'auto_complete'
   end
 
-  private
+private
+
   #----------------------------------------------------------------------------
   def require_admin_user
     require_user
@@ -39,4 +40,3 @@ class Admin::ApplicationController < EntitiesController
     end
   end
 end
-

data/app/controllers/admin/field_groups_controller.rb

@@ -16,7 +16,6 @@
 #------------------------------------------------------------------------------
 
 class Admin::FieldGroupsController < Admin::ApplicationController
-  before_filter :require_user
 
   # GET /admin/field_groups/new
   # GET /admin/field_groups/new.xml                                        AJAX
@@ -24,13 +23,7 @@ class Admin::FieldGroupsController < Admin::ApplicationController
   def new
     @field_group = FieldGroup.new(:klass_name => params[:klass_name])
 
-    respond_to do |format|
-      format.js   # new.js.rjs
-      format.xml  { render :xml => @field_group }
-    end
-
-  rescue ActiveRecord::RecordNotFound
-    respond_to_not_found(:html, :xml)
+    respond_with(@field_group)
   end
 
   # GET /admin/field_groups/1/edit                                         AJAX
@@ -39,29 +32,19 @@ class Admin::FieldGroupsController < Admin::ApplicationController
     @field_group = FieldGroup.find(params[:id])
 
     if params[:previous].to_s =~ /(\d+)\z/
-      @previous = FieldGroup.find($1)
+      @previous = FieldGroup.find_by_id($1) || $1.to_i
     end
 
-  rescue ActiveRecord::RecordNotFound
-    @previous ||= $1.to_i
-    respond_to_not_found(:js)
+    respond_with(@field_group)
   end
 
   # POST /admin/field_groups
   # POST /admin/field_groups.xml                                           AJAX
   #----------------------------------------------------------------------------
   def create
-    @field_group = FieldGroup.new(params[:field_group])
-
-    respond_to do |format|
-      if @field_group.save
-        format.js   # create.js.rjs
-        format.xml  { render :xml => @field_group, :status => :created, :location => @field_group }
-      else
-        format.js   # create.js.rjs
-        format.xml  { render :xml => @field_group.errors, :status => :unprocessable_entity }
-      end
-    end
+    @field_group = FieldGroup.create(params[:field_group])
+
+    respond_with(@field_group)
   end
 
   # PUT /admin/field_groups/1
@@ -69,19 +52,9 @@ class Admin::FieldGroupsController < Admin::ApplicationController
   #----------------------------------------------------------------------------
   def update
     @field_group = FieldGroup.find(params[:id])
+    @field_group.update_attributes(params[:field_group])
 
-    respond_to do |format|
-      if @field_group.update_attributes(params[:field_group])
-        format.js
-        format.xml  { head :ok }
-      else
-        format.js
-        format.xml  { render :xml => @field_group.errors, :status => :unprocessable_entity }
-      end
-    end
-
-  rescue ActiveRecord::RecordNotFound
-    respond_to_not_found(:js, :xml)
+    respond_with(@field_group)
   end
 
   # DELETE /admin/field_groups/1
@@ -89,18 +62,9 @@ class Admin::FieldGroupsController < Admin::ApplicationController
   #----------------------------------------------------------------------------
   def destroy
     @field_group = FieldGroup.find(params[:id])
+    @field_group.destroy
 
-    respond_to do |format|
-      if @field_group.destroy
-        # Redirect to fields index
-        format.js { render(:destroy) { |page| page.redirect_to admin_fields_url } }
-        format.xml  { head :ok }
-      else
-        flash[:warning] = t(:msg_cant_delete_field_group, @field_group.name)
-        format.js   # destroy.js.rjs
-        format.xml  { render :xml => @field_group.errors, :status => :unprocessable_entity }
-      end
-    end
+    respond_with(@field_group)
   end
 
   # POST /admin/field_groups/sort
@@ -115,14 +79,10 @@ class Admin::FieldGroupsController < Admin::ApplicationController
 
     render :nothing => true
   end
-  
+
   # GET /admin/field_groups/1/confirm                                      AJAX
   #----------------------------------------------------------------------------
   def confirm
     @field_group = FieldGroup.find(params[:id])
-
-  rescue ActiveRecord::RecordNotFound
-    respond_to_not_found(:js, :xml)
   end
-
 end

data/app/controllers/admin/fields_controller.rb

@@ -16,10 +16,9 @@
 #------------------------------------------------------------------------------
 
 class Admin::FieldsController < Admin::ApplicationController
-  before_filter :require_user
-  before_filter :set_current_tab, :only => [ :index, :show ]
   before_filter "set_current_tab('admin/fields')", :only => [ :index ]
-  before_filter :auto_complete, :only => :auto_complete
+
+  load_resource
 
   # GET /fields
   # GET /fields.xml                                                      HTML
@@ -31,15 +30,7 @@ class Admin::FieldsController < Admin::ApplicationController
   # GET /fields/1.xml                                                    HTML
   #----------------------------------------------------------------------------
   def show
-    @custom_field = Field.find(params[:id])
-
-    respond_to do |format|
-      format.html # show.html.erb
-      format.xml  { render :xml => @custom_field }
-    end
-
-  rescue ActiveRecord::RecordNotFound
-    respond_to_not_found(:html, :xml)
+    respond_with(@field)
   end
 
   # GET /fields/new
@@ -48,13 +39,7 @@ class Admin::FieldsController < Admin::ApplicationController
   def new
     @field = CustomField.new(:field_group_id => params[:field_group_id])
 
-    respond_to do |format|
-      format.js   # new.js.rjs
-      format.xml  { render :xml => @field }
-    end
-
-  rescue ActiveRecord::RecordNotFound # Kicks in if related asset was not found.
-    respond_to_not_found(:html, :xml)
+    respond_with(@custom_field)
   end
 
   # GET /fields/1/edit                                                   AJAX
@@ -63,29 +48,19 @@ class Admin::FieldsController < Admin::ApplicationController
     @field = Field.find(params[:id])
 
     if params[:previous].to_s =~ /(\d+)\z/
-      @previous = Field.find($1)
+      @previous = Field.find_by_id($1) || $1.to_i
     end
 
-  rescue ActiveRecord::RecordNotFound
-    @previous ||= $1.to_i
-    respond_to_not_found(:js)
+    respond_with(@field)
   end
 
   # POST /fields
   # POST /fields.xml                                                     AJAX
   #----------------------------------------------------------------------------
   def create
-    @field = CustomField.new(params[:field])
-
-    respond_to do |format|
-      if @field.save
-        format.js   # create.js.rjs
-        format.xml  { render :xml => @field, :status => :created, :location => @field }
-      else
-        format.js   # create.js.rjs
-        format.xml  { render :xml => @field.errors, :status => :unprocessable_entity }
-      end
-    end
+    @field = CustomField.create(params[:field])
+
+    respond_with(@field)
   end
 
   # PUT /fields/1
@@ -93,19 +68,9 @@ class Admin::FieldsController < Admin::ApplicationController
   #----------------------------------------------------------------------------
   def update
     @field = Field.find(params[:id])
+    @field.update_attributes(params[:field])
 
-    respond_to do |format|
-      if @field.update_attributes(params[:field])
-        format.js
-        format.xml  { head :ok }
-      else
-        format.js
-        format.xml  { render :xml => @field.errors, :status => :unprocessable_entity }
-      end
-    end
-
-  rescue ActiveRecord::RecordNotFound
-    respond_to_not_found(:js, :xml)
+    respond_with(@field)
   end
 
   # DELETE /fields/1
@@ -113,19 +78,9 @@ class Admin::FieldsController < Admin::ApplicationController
   #----------------------------------------------------------------------------
   def destroy
     @field = CustomField.find(params[:id])
+    @field.destroy
 
-    respond_to do |format|
-      if @field.destroy
-        format.js   # destroy.js.rjs
-        format.xml  { head :ok }
-      else
-        format.js   # destroy.js.rjs
-        format.xml  { render :xml => @field.errors, :status => :unprocessable_entity }
-      end
-    end
-
-  rescue ActiveRecord::RecordNotFound
-    respond_to_not_found(:html, :js, :xml)
+    respond_with(@field)
   end
 
   # POST /fields/sort
@@ -145,4 +100,3 @@ class Admin::FieldsController < Admin::ApplicationController
   #----------------------------------------------------------------------------
   # Handled by before_filter :auto_complete, :only => :auto_complete
 end
-

data/app/controllers/admin/plugins_controller.rb

@@ -24,10 +24,7 @@ class Admin::PluginsController < Admin::ApplicationController
   def index
     @plugins = FatFreeCRM::Plugin.list
 
-    respond_to do |format|
-      format.html # index.html.haml
-      format.xml  { render :xml => nil }
-    end
+    respond_with(@plugins)
   end
 end