papermill 0.16.2 → 0.16.3
Sign up to get free protection for your applications and to get access to all the features.
- data/VERSION +1 -1
- data/app/controllers/papermill_controller.rb +0 -1
- data/lib/papermill/papermill_asset.rb +2 -5
- data/public/papermill/papermill.css +1 -1
- metadata +1 -1
data/VERSION
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
0.16.
|
|
1
|
+
0.16.3
|
|
@@ -40,7 +40,6 @@ class PapermillController < ApplicationController
|
|
|
40
40
|
end
|
|
41
41
|
|
|
42
42
|
def create
|
|
43
|
-
puts "HAHA"
|
|
44
43
|
@asset = params[:asset_class].constantize.new(params.reject{|k, v| !(PapermillAsset.columns.map(&:name)+["Filedata", "Filename"]).include?(k)})
|
|
45
44
|
if @asset.save(:unique => !params[:gallery])
|
|
46
45
|
render :partial => "papermill/asset", :object => @asset, :locals => {:gallery => params[:gallery], :thumbnail_style => params[:thumbnail_style]}
|
|
@@ -1,10 +1,7 @@
|
|
|
1
1
|
class PapermillAsset < ActiveRecord::Base
|
|
2
2
|
|
|
3
3
|
before_destroy :destroy_files
|
|
4
|
-
before_create :set_position
|
|
5
|
-
|
|
6
|
-
attr_protected :position, :file_file_name
|
|
7
|
-
|
|
4
|
+
before_create :set_position
|
|
8
5
|
|
|
9
6
|
has_attached_file :file,
|
|
10
7
|
:path => "#{Papermill::options[:public_root]}/#{Papermill::options[:papermill_prefix]}/#{Papermill::PAPERCLIP_INTERPOLATION_STRING}",
|
|
@@ -99,7 +96,7 @@ class PapermillAsset < ActiveRecord::Base
|
|
|
99
96
|
private
|
|
100
97
|
|
|
101
98
|
def set_real_file_name
|
|
102
|
-
self.file_file_name = @real_file_name
|
|
99
|
+
self.file_file_name = @real_file_name if @real_file_name
|
|
103
100
|
end
|
|
104
101
|
|
|
105
102
|
def set_position
|
|
@@ -19,7 +19,7 @@
|
|
|
19
19
|
.papermill .progress { display:block; border:1px solid #C2E3EF; text-align:left; height:6px; }
|
|
20
20
|
.papermill .progress span { background:#7BB963; height:6px; width:0; display:block; }
|
|
21
21
|
|
|
22
|
-
.papermill .dashboard li a { display:inline; padding-
|
|
22
|
+
.papermill .dashboard li a { display:inline; padding-left:20px; }
|
|
23
23
|
.papermill .dashboard li.mass_edit a { background:transparent url(images/mass-edit.png) no-repeat top left; }
|
|
24
24
|
.papermill .dashboard li.mass_delete a { background:transparent url(images/mass-delete.png) no-repeat top left; }
|
|
25
25
|
|