From d5c4da3bf0ba903fc942a127b7cceeecae803b1d Mon Sep 17 00:00:00 2001
From: Maikel Linke <mkllnk@web.de>
Date: Wed, 28 Oct 2015 16:32:34 +1100
Subject: [PATCH] Not using Paperclip's  to avoid HTTP calls to S3

---
 app/serializers/api/enterprise_serializer.rb | 4 ++--
 app/views/json/_groups.rabl                  | 4 ++--
 app/views/json/partials/_enterprise.rabl     | 4 ++--
 app/views/shopping_shared/_details.html.haml | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/serializers/api/enterprise_serializer.rb b/app/serializers/api/enterprise_serializer.rb
index 201757314f..287ebfe872 100644
--- a/app/serializers/api/enterprise_serializer.rb
+++ b/app/serializers/api/enterprise_serializer.rb
@@ -76,11 +76,11 @@ class Api::CachedEnterpriseSerializer < ActiveModel::Serializer
   end
 
   def logo
-    object.logo(:medium) if object.logo.exists?
+    object.logo(:medium) if object.logo?
   end
 
   def promo_image
-    object.promo_image(:large) if object.promo_image.exists?
+    object.promo_image(:large) if object.promo_image?
   end
 
   def path
diff --git a/app/views/json/_groups.rabl b/app/views/json/_groups.rabl
index bc50586a62..adf0e57709 100644
--- a/app/views/json/_groups.rabl
+++ b/app/views/json/_groups.rabl
@@ -6,11 +6,11 @@ child enterprises: :enterprises do
 end
 
 node :logo do |group|
-  group.logo(:medium) if group.logo.exists?
+  group.logo(:medium) if group.logo?
 end
 
 node :promo_image do |group|
-  group.promo_image(:large) if group.promo_image.exists?
+  group.promo_image(:large) if group.promo_image?
 end
 
 node :state do |group|
diff --git a/app/views/json/partials/_enterprise.rabl b/app/views/json/partials/_enterprise.rabl
index b8800e22ae..6e17cf3c58 100644
--- a/app/views/json/partials/_enterprise.rabl
+++ b/app/views/json/partials/_enterprise.rabl
@@ -13,11 +13,11 @@ node :hash do |enterprise|
 end
 
 node :logo do |enterprise|
-  enterprise.logo(:medium) if enterprise.logo.exists?
+  enterprise.logo(:medium) if enterprise.logo?
 end
 
 node :promo_image do |enterprise|
-  enterprise.promo_image(:large) if enterprise.promo_image.exists?
+  enterprise.promo_image(:large) if enterprise.promo_image?
 end
 
 node :icon do |e|
diff --git a/app/views/shopping_shared/_details.html.haml b/app/views/shopping_shared/_details.html.haml
index 247f1142b9..d060c130ca 100644
--- a/app/views/shopping_shared/_details.html.haml
+++ b/app/views/shopping_shared/_details.html.haml
@@ -2,7 +2,7 @@
   %distributor.details.row
     .small-12.medium-6.large-6.columns
       #distributor_title
-        - if current_distributor.logo.exists?
+        - if current_distributor.logo?
           %img.left{src: current_distributor.logo.url(:thumb)}
         %h3
           = current_distributor.name