Modification in Design structure_css -> default_css

app/controllers/admin/designs_controller.rb

@@ -101,12 +101,18 @@ class Admin::DesignsController < ApplicationController
               filename = File.basename(entry.to_s)
               temp_file = File.new(dir + '/' + filename, 'w+') 
               temp_file.write (zip_file.read entry ).force_encoding('UTF-8')
-              design.default_css = temp_file
+              default_css = design.build_default_css
+              default_css.file = temp_file
+              default_css.file_filename = filename
+              default_css.to_save = true
             when /\A(#{zip_name})\/(reset\.css)\z/    #for reset css
               filename = File.basename(entry.to_s)
               temp_file = File.new(dir + '/' + filename, 'w+') 
               temp_file.write (zip_file.read entry ).force_encoding('UTF-8')
-              design.reset_css = temp_file
+              reset_css = design.build_reset_css
+              reset_css.file = temp_file
+              reset_css.file_filename = filename
+              reset_css.to_save = true
             when /\A(#{zip_name})\/(layout\.html)\z/    #for layout html
               filename = File.basename(entry.to_s)
               temp_file = File.new(dir + '/' + filename, 'w+') 

app/controllers/admin/purchases_controller.rb

@@ -58,24 +58,13 @@ class Admin::PurchasesController < ApplicationController
         design = Design.new.from_json(orig_zip.read("#{zip_name}/#{zip_name}.json"))
         Dir.mktmpdir('f_path') { |dir|
           
-          title = design.layout.file_filename
-          temp = File.new(dir + '/' + title, 'w+')
-          temp.write orig_zip.read(zip_name + '/' + title)
-          design.layout.file = temp
-          design.layout.to_save = true
-          
-          title = design.default_css_filename
-          temp = File.new(dir + '/' + title, 'w+')
-          temp.write orig_zip.read(zip_name + '/' + title)
-          design.default_css = temp
+          build_file(orig_zip, zip_name, dir, design.layout) if design.layout
+          build_file(orig_zip, zip_name, dir, design.default_css) if design.default_css
+          build_file(orig_zip, zip_name, dir, design.reset_css) if design.reset_css
           
           ['themes', 'javascripts', 'images'].each do |type|
             design.send(type).each do |object|
-              title = object.file_filename
-              temp = File.new(dir + '/' + title, 'w+')
-              temp.write orig_zip.read(zip_name + '/' + type + '/' + title)
-              object.file = temp
-              object.to_save = true
+              build_file(orig_zip, zip_name, dir, object, type)
             end
           end
         }
@@ -86,5 +75,13 @@ class Admin::PurchasesController < ApplicationController
       
     end
   end
+  
+  def build_file(orig_zip, zip_name, dir, object, type = nil)
+    title = object.file_filename
+    temp = File.new(dir + '/' + title, 'w+')
+    temp.write orig_zip.read(zip_name + '/' + (type ? (type + '/') : '') + title)
+    object.file = temp
+    object.to_save = true
+  end
 
 end