From 63530a3a30df268793d57caaedd91c2ee27b823d Mon Sep 17 00:00:00 2001
From: did <didier@nocoffee.fr>
Date: Thu, 10 Mar 2011 02:59:35 +0100
Subject: [PATCH] still a problem with the last heroku gem (json) + fix an
 issue with invalid assets

---
 Gemfile                                | 3 +--
 Gemfile.lock                           | 2 +-
 app/views/admin/assets/_form.html.haml | 2 +-
 locomotive_cms.gemspec                 | 2 +-
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/Gemfile b/Gemfile
index bb72bed3..b1fa2d95 100644
--- a/Gemfile
+++ b/Gemfile
@@ -24,8 +24,7 @@ gem 'custom_fields', '1.0.0.beta.6'
 gem 'fog', '0.3.7'
 gem 'mimetype-fu'
 gem 'actionmailer-with-request'
-gem 'json'
-gem 'heroku', '1.18.3'
+gem 'heroku', '1.18.2'
 gem 'httparty', '>= 0.6.1'
 gem 'RedCloth', '4.2.7'
 gem 'delayed_job', '2.1.4'
diff --git a/Gemfile.lock b/Gemfile.lock
index 65dd2f1e..4c986716 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -82,7 +82,7 @@ GEM
       locomotive_carrierwave
       mongoid (~> 2.0.0.rc.7)
     daemons (1.1.0)
-    database_cleaner (0.6.4)
+    database_cleaner (0.6.5)
     delayed_job (2.1.4)
       activesupport (~> 3.0)
       daemons
diff --git a/app/views/admin/assets/_form.html.haml b/app/views/admin/assets/_form.html.haml
index 3d686e39..20fc1a7c 100644
--- a/app/views/admin/assets/_form.html.haml
+++ b/app/views/admin/assets/_form.html.haml
@@ -4,7 +4,7 @@
 
 = f.inputs :name => :information do
   = f.input :name
-  = f.input :source, :hint_options => { :url => link_to(@asset.source_filename, @asset.source.url), :escaping => false }
+  = f.input :source, :hint_options => @asset.persisted? ? { :url => link_to(@asset.source_filename, @asset.source.url), :escaping => false } : {}
 
 - unless @asset.custom_fields.blank?
   = render 'admin/custom_fields/custom_form', :form => f, :title => :other_fields, :parent => @asset_collection
diff --git a/locomotive_cms.gemspec b/locomotive_cms.gemspec
index e2f39e60..8ad703d7 100644
--- a/locomotive_cms.gemspec
+++ b/locomotive_cms.gemspec
@@ -37,7 +37,7 @@ Gem::Specification.new do |s|
   s.add_dependency "fog", "0.3.7"
   s.add_dependency "mimetype-fu"
   s.add_dependency "actionmailer-with-request"
-  s.add_dependency "heroku", "1.18.3"
+  s.add_dependency "heroku", "1.18.2"
   s.add_dependency "httparty", ">= 0.6.1"
   s.add_dependency "RedCloth", "4.2.7"
   s.add_dependency "delayed_job", "2.1.4"