beef-has_assets 0.7.1 → 0.7.2

data/VERSION

@@ -1 +1 @@
-0.7.1
+0.7.2

data/app/controllers/admin/assets_controller.rb

@@ -43,7 +43,7 @@ class Admin::AssetsController < Admin::BaseController
   def category
     category = params[:category].strip
     if category == 'No Folder'
-      conditions = "category IS NULL or category = ''"
+      conditions = "category IS NULL OR category = '' OR category = 'No Folder'"
     else
       conditions = ["category = ?", category]
     end

data/beef-has_assets.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{beef-has_assets}
-  s.version = "0.7.1"
+  s.version = "0.7.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Steve England"]
-  s.date = %q{2010-02-09}
+  s.date = %q{2010-04-16}
   s.email = %q{steve@wearebeef.co.uk}
   s.extra_rdoc_files = [
     "LICENSE",
@@ -75,8 +75,8 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.3.5}
   s.summary = %q{Rails Engine. Adds uploadable assets to a model and admin area for files}
   s.test_files = [
-    "test/has_assets_test.rb",
-     "test/test_helper.rb"
+    "test/test_helper.rb",
+     "test/has_assets_test.rb"
   ]
 
   if s.respond_to? :specification_version then

data/generators/assets_admin_files/templates/public/javascripts/admin/assets.js

@@ -221,8 +221,9 @@ Object.extend(AssetBrowser, {
 var swfu;
 Event.observe(window, 'load', function() {
   if ($('asset-browser')) {
+    file_size_limit = '7 MB';
     form = $('asset-upload-form');
-    form.insert({after: '<div id="flash-button"></div>'});
+    form.insert({after: '<div id="flash-button"></div><span>upto ' + file_size_limit + '</span>'});
     js_path =  form.action.split('?').join('.js?');
     swfu = new SWFUpload({
       // Create the custom swfupload_photos_path in the routes.rb file
@@ -231,7 +232,7 @@ Event.observe(window, 'load', function() {
       flash_url : '/flash/swfupload.swf',
       file_post_name: 'asset[uploaded_data]', 
 
-      file_size_limit : '7 MB',
+      file_size_limit : file_size_limit,
       file_upload_limit : 0,
 
       file_queue_error_handler : UploadHandler.fileQueueError,

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: beef-has_assets
 version: !ruby/object:Gem::Version 
-  version: 0.7.1
+  version: 0.7.2
 platform: ruby
 authors: 
 - Steve England
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-09 00:00:00 +00:00
+date: 2010-04-16 00:00:00 +01:00
 default_executable: 
 dependencies: []
 
@@ -104,5 +104,5 @@ signing_key:
 specification_version: 3
 summary: Rails Engine. Adds uploadable assets to a model and admin area for files
 test_files: 
-- test/has_assets_test.rb
 - test/test_helper.rb
+- test/has_assets_test.rb