beef-has_assets 0.6.6 → 0.6.7

data/VERSION

@@ -1 +1 @@
-0.6.6
+0.6.7

data/app/controllers/admin/assets_controller.rb

@@ -41,7 +41,7 @@ class Admin::AssetsController < Admin::BaseController
   end
 
   def category
-    @assets = Asset.all(:conditions => ["category = ?",params[:category]])
+    @assets = Asset.all(:conditions => ["category = ?",params[:category].rstrip])
 
     respond_to do |format|
       format.html { render :layout => false}

data/app/controllers/admin/flickrs_controller.rb

@@ -1,4 +1,6 @@
 class Admin::FlickrsController < Admin::BaseController
+  helper AssetsHelper
+  
   def create
     flickr = Flickr.new("#{RAILS_ROOT}/config/flickr.yml")
     redirect_to flickr.auth.url(:write)

data/app/helpers/admin/assets_helper.rb

@@ -51,4 +51,8 @@ module Admin::AssetsHelper
     return unless defined?(Flickr) and File.exists?("#{RAILS_ROOT}/config/flickr.yml") and !Settings.flickr_user_id.blank?
     render :partial => 'admin/flickrs/selector'
   end
+  
+  def flickr_default_size
+    defined?(Beef::Has::Assets::FLICKR_DEFAULT_SIZE) ?  Beef::Has::Assets::FLICKR_DEFAULT_SIZE : :medium 
+  end
 end

data/app/views/admin/flickrs/_photo.html.erb

@@ -1 +1 @@
-<%= link_to "#{image_tag photo.url(:square), :alt => photo.description}", "#{photo.url(:large)}", :title => "#{photo.title}", :onclick => "addLinkedImage('#{photo.url(:medium)}',this.title); return false;" %>
+<%= link_to "#{image_tag photo.url(:square), :alt => photo.description}", "#{photo.url(:large)}", :title => "#{photo.title}", :onclick => "addLinkedImage('#{photo.url(flickr_default_size)}',this.title); return false;" %>

data/beef-has_assets.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{beef-has_assets}
-  s.version = "0.6.6"
+  s.version = "0.6.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Steve England"]
-  s.date = %q{2009-12-01}
+  s.date = %q{2010-01-14}
   s.email = %q{steve@wearebeef.co.uk}
   s.extra_rdoc_files = [
     "LICENSE",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: beef-has_assets
 version: !ruby/object:Gem::Version 
-  version: 0.6.6
+  version: 0.6.7
 platform: ruby
 authors: 
 - Steve England
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-01 00:00:00 +00:00
+date: 2010-01-14 00:00:00 +00:00
 default_executable: 
 dependencies: []