Modifications in the Design code: the uploader works but the edit is broken
This commit is contained in:
Christophe Vilayphiou committed
1 parent
783eae4597
commit
46db173e0b
6 files changed
+75
-122
No files matched your search
+43
-86
@@ -9,61 +9,36 @@ class Design
|
||||
|
||||
has_many :pages
|
||||
|
||||
embeds_one :layout
|
||||
embeds_one :default_css, :class_name => "Stylesheet"
|
||||
embeds_one :reset_css, :class_name => "Stylesheet"
|
||||
embeds_many :stylesheets
|
||||
embeds_many :themes
|
||||
embeds_many :javascripts
|
||||
embeds_many :images
|
||||
embeds_many :custom_images, :class_name => 'Image', as: :design_image
|
||||
embeds_one :layout, :cascade_callbacks => true
|
||||
embeds_one :default_css, :class_name => "Stylesheet", :cascade_callbacks => true
|
||||
embeds_one :reset_css, :class_name => "Stylesheet", :cascade_callbacks => true
|
||||
embeds_many :themes, :cascade_callbacks => true
|
||||
embeds_many :javascripts, :cascade_callbacks => true
|
||||
embeds_many :images, :cascade_callbacks => true
|
||||
embeds_many :custom_images, :class_name => 'Image', :cascade_callbacks => true
|
||||
|
||||
validates_presence_of :title
|
||||
validates_presence_of :author
|
||||
|
||||
after_save :procs_embedded_objects
|
||||
# after_destroy :del_embedded_objects
|
||||
after_save :parse_css_for_images
|
||||
|
||||
# validate do
|
||||
# errors.add('atttribute1', 'error for 1') if files_with_duplicate?
|
||||
# errors.add('atttribute2', 'error for 1') if files_with_noname?
|
||||
# end
|
||||
|
||||
def files_with_duplicate?
|
||||
[self.javascripts, self.images,self.themes].each do |objects_hash|
|
||||
ary = objects_hash.collect{ |k| k.file_identifier}
|
||||
ary.compact!
|
||||
# debugger
|
||||
return true if(ary.count!=ary.uniq.count)
|
||||
end
|
||||
false
|
||||
end
|
||||
|
||||
def files_with_noname?
|
||||
[self.javascripts, self.images,self.themes].each do |objects_hash|
|
||||
objects_hash.each{ |k|
|
||||
return true if(k.file_identifier.nil? && !k.to_save?)
|
||||
}
|
||||
end
|
||||
false
|
||||
end
|
||||
def new_files=(*attrs)
|
||||
attrs[0].map do |key,items_ary| #Loop by JSs,Themes,Imgs
|
||||
self.files=([items_ary, key])
|
||||
end
|
||||
end
|
||||
|
||||
def javascripts=(*attrs)
|
||||
self.files = (attrs << 'javascripts')
|
||||
end
|
||||
|
||||
def themes=(*attrs)
|
||||
self.files = (attrs << 'themes')
|
||||
end
|
||||
|
||||
def images=(*attrs)
|
||||
self.files = (attrs << 'images')
|
||||
end
|
||||
# def javascripts=(*attrs)
|
||||
# self.files = (attrs << 'javascripts')
|
||||
# end
|
||||
#
|
||||
# def themes=(*attrs)
|
||||
# self.files = (attrs << 'themes')
|
||||
# end
|
||||
#
|
||||
# def images=(*attrs)
|
||||
# self.files = (attrs << 'images')
|
||||
# end
|
||||
|
||||
# Update or create the attribute records
|
||||
def files=(attrs)
|
||||
@@ -89,52 +64,34 @@ class Design
|
||||
|
||||
protected
|
||||
|
||||
def del_embedded_objects
|
||||
[[self.layout],self.themes, self.javascripts, self.images].each do |objects|
|
||||
objects.each do |object|
|
||||
object.destroy
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
def procs_embedded_objects
|
||||
[self.javascripts, self.images].each do |objects|
|
||||
objects.each do |object|
|
||||
process_object(object)
|
||||
end
|
||||
def parse_css_for_images
|
||||
self.images.each do |image|
|
||||
image.save
|
||||
end
|
||||
if self.layout.to_save
|
||||
self.layout.to_save = false
|
||||
self.layout.save
|
||||
if (self.default_css && self.default_css.changed)
|
||||
self.default_css.parse_urls
|
||||
attrs = self.default_css.attributes
|
||||
file = self.default_css.file
|
||||
file_orig = self.default_css.file_orig
|
||||
self.default_css.destroy
|
||||
d = self.build_default_css(attrs)
|
||||
d.file = file
|
||||
d.file_orig = file_orig
|
||||
d.save
|
||||
end
|
||||
[[self.default_css], [self.reset_css], self.themes].each do |objects|
|
||||
objects.each do |object|
|
||||
if object
|
||||
to_parse_url = object.to_save ? true : false
|
||||
process_object(object)
|
||||
object.parse_urls if to_parse_url
|
||||
end
|
||||
self.themes.each do |theme|
|
||||
if theme.changed
|
||||
theme.parse_urls
|
||||
attrs = theme.attributes
|
||||
file = theme.file
|
||||
file_orig = theme.file_orig
|
||||
theme.destroy
|
||||
t = self.themes.build(attrs)
|
||||
t.file = file
|
||||
t.file_orig = file_orig
|
||||
t.save
|
||||
end
|
||||
end
|
||||
self.valid?
|
||||
end
|
||||
|
||||
def process_object(object)
|
||||
if object.to_save
|
||||
if object.file_identifier.nil?
|
||||
new_object = self.send(object._type.downcase.pluralize).build(object.attributes)
|
||||
new_object.file = object.file
|
||||
object.destroy
|
||||
new_object.to_save = false
|
||||
new_object.save
|
||||
else
|
||||
object.to_save = false
|
||||
object.save
|
||||
end
|
||||
end
|
||||
if object.to_destroy
|
||||
object.destroy
|
||||
end
|
||||
end
|
||||
|
||||
end
|
||||
@@ -4,8 +4,8 @@ class Stylesheet < DesignFile
|
||||
|
||||
def parse_urls
|
||||
orig_content = content = self.file.read.force_encoding("UTF-8")
|
||||
self.remove_file!
|
||||
self.remove_file_orig!
|
||||
# self.remove_file!
|
||||
# self.remove_file_orig!
|
||||
names = []
|
||||
images = self.design.images
|
||||
content.scan(/(?<=url)(.*?)(?=\))/){
|
||||
@@ -27,9 +27,7 @@ class Stylesheet < DesignFile
|
||||
temp_file = File.new(dir + '/' + orig_file_name, 'w+')
|
||||
temp_file.write content.force_encoding("UTF-8")
|
||||
self.file = temp_file
|
||||
|
||||
self.save
|
||||
}
|
||||
}
|
||||
end
|
||||
|
||||
end
|
||||
Reference in new issue
Block a user