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

+3 -3
View File
@@ -31,7 +31,7 @@ class Design
def files_with_duplicate?
[self.javascripts, self.images,self.themes].each do |objects_hash|
ary = objects_hash.collect{ |k| k.file_filename}
ary = objects_hash.collect{ |k| k.file_identifier}
ary.compact!
# debugger
return true if(ary.count!=ary.uniq.count)
@@ -42,7 +42,7 @@ class Design
def files_with_noname?
[self.javascripts, self.images,self.themes].each do |objects_hash|
objects_hash.each{ |k|
return true if(k.file_filename.nil? && !k.to_save?)
return true if(k.file_identifier.nil? && !k.to_save?)
}
end
false
@@ -121,7 +121,7 @@ class Design
def process_object(object)
if object.to_save
if object.file_filename.nil?
if object.file_identifier.nil?
new_object = self.send(object._type.downcase.pluralize).build(object.attributes)
new_object.file = object.file
object.destroy
+2 -2
View File
@@ -11,14 +11,14 @@ class Stylesheet < DesignFile
content.scan(/(?<=url)(.*?)(?=\))/){
css_name = $1.gsub(' ','').gsub('(','')
name = File.basename(css_name).gsub(/[\\\"]/, '')
file_name = images.detect{ |i| i.file_filename.eql?(name) }.file_url rescue nil
file_name = images.detect{ |i| i.file_identifier.eql?(name) }.file_url rescue nil
names << [css_name, file_name]
}
names.each do |name|
content.gsub!(name[0], name[1]) if name[1]
end
Dir.mktmpdir('f_path') { |dir|
orig_file_name = self.file_filename
orig_file_name = self.file_identifier
temp_file = File.new(dir + '/' + orig_file_name, 'w+')
temp_file.write orig_content.force_encoding("UTF-8")
+1 -1
View File
@@ -7,7 +7,7 @@ class Theme < Stylesheet
protected
def set_name
self.name = File.basename(self.file_filename,".css")
self.name = File.basename(self.file_identifier,".css")
end
end