fat_free_crm 0.13.5 → 0.13.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 25e31e5cc09622f338148fcf35500de072cb50ea
-  data.tar.gz: 22f374343d5c00e6313e89162759b2f98017b8ab
+  metadata.gz: ce186159c267064d32924e1116da602a875ea3de
+  data.tar.gz: ff0fd2379f861a86297a01c7c0499aee392410ac
 SHA512:
-  metadata.gz: 5cc1ac5c20a97f51cfc9a71e8b03293b46e21c3d981c338de12896d3a6de94843ac9bf4c873a8072387fe137fb4c83845ca5dee115b87b7f05152112b279e7ff
-  data.tar.gz: 2a3e8cc15ba763ac680e469eb83e015da7624a7d097e813227e8ffda42cc2c475f92246f1fb7a0d8cd11a53b3a5dae365e60136c415f807b5bde4a790da91821
+  metadata.gz: b65a6ab2b4e1c51f92995c3db7aafb8eacdb98c3c3e3a3af1a2f4dcf32027a6e7c0583ff3fdef4277aaca648d07236e79db01521389286416ffe4f7d78fb41f9
+  data.tar.gz: 27595bcf7d5a1e20496804426fde316ce1a1e06f27780afe9ac270ecbdcd16104278afeaa82eae6c93bb782d195cb1cde58be2dfc27838002172daeb4d4cf9f5

data/app/controllers/application_controller.rb

@@ -49,6 +49,16 @@ class ApplicationController < ActionController::Base
 
 private
 
+  #
+  # In rails 3, the default behaviour for handle_unverified_request is to delete the session
+  # and continue executing the request. However, we use cookie based authentication and need
+  # to halt proceedings. In Rails 4, use "protect_from_forgery with: :exception"
+  # See http://blog.nvisium.com/2014/09/understanding-protectfromforgery.html for more details.
+  #----------------------------------------------------------------------------
+  def handle_unverified_request
+    raise ActionController::InvalidAuthenticityToken
+  end
+
   #
   # Takes { :related => 'campaigns/7' } or { :related => '5' }
   #   and returns array of object ids that should be excluded from search

data/app/views/users/_user.html.haml

@@ -21,8 +21,12 @@
       - if !@user.phone.blank? && !@user.mobile.blank?
         %div #{t :phone}: <b>#{@user.phone}</b>, #{t :mobile}: <b>#{@user.mobile}</b>
       - else
-        = "#{t :phone}: <b>#{@user.phone}</b>" unless @user.phone.blank?
-        = "#{t :mobile}: <b>#{@user.mobile}</b>" unless @user.mobile.blank?
+        - if @user.phone.present?
+          = t(:phone) + ":"
+          = content_tag(:b, @user.phone)
+        - if @user.mobile.present?
+          = t(:mobile) + ":"
+          = content_tag(:b, @user.mobile)
 
 - if Setting.per_user_locale
   %script= render "languages"

data/lib/fat_free_crm/version.rb

@@ -7,7 +7,7 @@ module FatFreeCRM
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 13
-    TINY  = 5
+    TINY  = 6
     PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fat_free_crm
 version: !ruby/object:Gem::Version
-  version: 0.13.5
+  version: 0.13.6
 platform: ruby
 authors:
 - Michael Dvorkin
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-22 00:00:00.000000000 Z
+date: 2015-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails