Change "_filename" to "_identifier" for carrierwave

This commit is contained in:
Christophe Vilayphiou committed 2012-01-24 11:57:27 +08:00
1 parent 5518ae362d
commit 9fcf8280fa
8 files changed
+15 -15

No files matched your search

+4 -4
View File
@@ -46,7 +46,7 @@ class Admin::DesignsController < ApplicationController
filename = params[:filename]
files = @design.themes + @design.javascripts + @design.images
file_to_removed = files.find{ |obj|
obj.file_filename == filename
obj.file_identifier == filename
}
type = file_to_removed._type
new_file = ""
@@ -103,7 +103,7 @@ class Admin::DesignsController < ApplicationController
temp_file.write (zip_file.read entry ).force_encoding('UTF-8')
default_css = design.build_default_css
default_css.file = temp_file
default_css.file_filename = filename
default_css.file_identifier = filename
default_css.to_save = true
when /\A(#{zip_name})\/(reset\.css)\z/ #for reset css
filename = File.basename(entry.to_s)
@@ -111,7 +111,7 @@ class Admin::DesignsController < ApplicationController
temp_file.write (zip_file.read entry ).force_encoding('UTF-8')
reset_css = design.build_reset_css
reset_css.file = temp_file
reset_css.file_filename = filename
reset_css.file_identifier = filename
reset_css.to_save = true
when /\A(#{zip_name})\/(layout\.html)\z/ #for layout html
filename = File.basename(entry.to_s)
@@ -135,7 +135,7 @@ class Admin::DesignsController < ApplicationController
temp_file.write (zip_file.read entry).force_encoding('UTF-8')
build_and_store = eval("design.#{type}").build
build_and_store.file = temp_file
build_and_store.file_filename = filename
build_and_store.file_identifier = filename
build_and_store.to_save = true
end
end
@@ -172,7 +172,7 @@ class Admin::PurchasesController < ApplicationController
def build_file(orig_zip, zip_name, dir, object, type = nil)
title = object.file_filename
title = object.file_identifier
temp = File.new(dir + '/' + title, 'w+')
temp.write orig_zip.read(zip_name + '/' + (type ? (type + '/') : '') + title)
object.file = temp