beef-has_assets 0.7.1 → 0.7.2
Sign up to get free protection for your applications and to get access to all the features.
data/VERSION
CHANGED
@@ -1 +1 @@
|
|
1
|
-
0.7.
|
1
|
+
0.7.2
|
@@ -43,7 +43,7 @@ class Admin::AssetsController < Admin::BaseController
|
|
43
43
|
def category
|
44
44
|
category = params[:category].strip
|
45
45
|
if category == 'No Folder'
|
46
|
-
conditions = "category IS NULL
|
46
|
+
conditions = "category IS NULL OR category = '' OR category = 'No Folder'"
|
47
47
|
else
|
48
48
|
conditions = ["category = ?", category]
|
49
49
|
end
|
data/beef-has_assets.gemspec
CHANGED
@@ -5,11 +5,11 @@
|
|
5
5
|
|
6
6
|
Gem::Specification.new do |s|
|
7
7
|
s.name = %q{beef-has_assets}
|
8
|
-
s.version = "0.7.
|
8
|
+
s.version = "0.7.2"
|
9
9
|
|
10
10
|
s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
|
11
11
|
s.authors = ["Steve England"]
|
12
|
-
s.date = %q{2010-
|
12
|
+
s.date = %q{2010-04-16}
|
13
13
|
s.email = %q{steve@wearebeef.co.uk}
|
14
14
|
s.extra_rdoc_files = [
|
15
15
|
"LICENSE",
|
@@ -75,8 +75,8 @@ Gem::Specification.new do |s|
|
|
75
75
|
s.rubygems_version = %q{1.3.5}
|
76
76
|
s.summary = %q{Rails Engine. Adds uploadable assets to a model and admin area for files}
|
77
77
|
s.test_files = [
|
78
|
-
"test/
|
79
|
-
"test/
|
78
|
+
"test/test_helper.rb",
|
79
|
+
"test/has_assets_test.rb"
|
80
80
|
]
|
81
81
|
|
82
82
|
if s.respond_to? :specification_version then
|
@@ -221,8 +221,9 @@ Object.extend(AssetBrowser, {
|
|
221
221
|
var swfu;
|
222
222
|
Event.observe(window, 'load', function() {
|
223
223
|
if ($('asset-browser')) {
|
224
|
+
file_size_limit = '7 MB';
|
224
225
|
form = $('asset-upload-form');
|
225
|
-
form.insert({after: '<div id="flash-button"></div>'});
|
226
|
+
form.insert({after: '<div id="flash-button"></div><span>upto ' + file_size_limit + '</span>'});
|
226
227
|
js_path = form.action.split('?').join('.js?');
|
227
228
|
swfu = new SWFUpload({
|
228
229
|
// Create the custom swfupload_photos_path in the routes.rb file
|
@@ -231,7 +232,7 @@ Event.observe(window, 'load', function() {
|
|
231
232
|
flash_url : '/flash/swfupload.swf',
|
232
233
|
file_post_name: 'asset[uploaded_data]',
|
233
234
|
|
234
|
-
file_size_limit :
|
235
|
+
file_size_limit : file_size_limit,
|
235
236
|
file_upload_limit : 0,
|
236
237
|
|
237
238
|
file_queue_error_handler : UploadHandler.fileQueueError,
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: beef-has_assets
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.7.
|
4
|
+
version: 0.7.2
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Steve England
|
@@ -9,7 +9,7 @@ autorequire:
|
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
11
|
|
12
|
-
date: 2010-
|
12
|
+
date: 2010-04-16 00:00:00 +01:00
|
13
13
|
default_executable:
|
14
14
|
dependencies: []
|
15
15
|
|
@@ -104,5 +104,5 @@ signing_key:
|
|
104
104
|
specification_version: 3
|
105
105
|
summary: Rails Engine. Adds uploadable assets to a model and admin area for files
|
106
106
|
test_files:
|
107
|
-
- test/has_assets_test.rb
|
108
107
|
- test/test_helper.rb
|
108
|
+
- test/has_assets_test.rb
|