Edit uploaded package

app/controllers/admin/designs_controller.rb

@@ -34,14 +34,37 @@ class Admin::DesignsController < OrbitBackendController
 
   def update
     @design = Design.find(params[:id])
-    if @design.update_attributes(params[:design])
-      flash[:notice] = "Successfully updated design and tasks."
-      redirect_to admin_designs_url(@design)
-    else
-      render :action => 'edit'
+    @design.update_attributes(params[:design])
+    # if @design.update_attributes(params[:design])
+    #   flash[:notice] = "Successfully updated design and tasks."
+    #   redirect_to admin_designs_url(@design)
+    # else
+    #   render :action => 'edit'
+    # end
+
+    respond_to do |format|
+      format.js  {nil}
     end
   end
 
+  def update_file
+    @design = Design.find(params[:id])
+    case params[:type]
+    when 'layout', 'css_default', 'css_reset'
+      @object = @design.send(params[:type])
+    when 'image', 'javascript', 'theme'
+      @object = @design.send(params[:type]).find(params[:object_id])
+    end
+
+    Dir.mktmpdir('f_path') { |dir|
+      temp_file = File.new(dir + '/' + File.basename(@object.file.url), 'w+') 
+      temp_file.write(params[:file][:content].force_encoding('UTF-8'))
+      @object.remove_file!
+      @object.file = temp_file
+      @object.save
+    }
+  end
+
   def edit_file
     @design = Design.find(params[:id])
     filename = params[:filename]
@@ -91,6 +114,13 @@ class Admin::DesignsController < OrbitBackendController
     end
     redirect_to admin_designs_url(:direction => params[:direction], :sort => params[:sort], :sort_options => params[:sort_options])
   end
+
+  def upload_image
+    @design = Design.find(params[:id])
+    @image = @design.images.build(params[:image])
+    @image.save
+    render :layout => false
+  end
   
   protected
   
@@ -98,7 +128,6 @@ class Admin::DesignsController < OrbitBackendController
     Zip::ZipFile.open(file) { |zip_file|
       design = Design.new.from_json(zip_file.read("#{zip_name}/info.json"))
       Dir.mktmpdir('f_path') { |dir|
-        design.build_layout
         themes_entries = []
         javascripts_entries = []
         images_entries = []
@@ -106,25 +135,11 @@ class Admin::DesignsController < OrbitBackendController
         zip_file.entries.each do |entry|
           case (path = entry.to_s)
             when /\A(#{zip_name})\/(default\.css)\z/    #for default 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')
-              default_css = design.build_default_css
-              default_css.file = temp_file
-              default_css.to_save = true
+              design.build_css_default(:file => get_temp_file(zip_file, dir, entry))
             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')
-              reset_css = design.build_reset_css
-              reset_css.file = temp_file
-              reset_css.to_save = true
+              design.build_css_reset(:file => get_temp_file(zip_file, dir, entry))
             when /\A(#{zip_name})\/(layout\.html)\z/    #for layout html
-              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.layout.file = temp_file
-              design.layout.to_save=true
+              design.build_layout(:file => get_temp_file(zip_file, dir, entry))
             when /\A(#{zip_name})\/(themes)\/.*(\.css)\z/   #for themes css
               themes_entries << entry
             when /\A(#{zip_name})\/(javascripts)\/.*(\.js)\z/   #for js
@@ -136,12 +151,7 @@ class Admin::DesignsController < OrbitBackendController
 
         ['themes', 'javascripts', 'images'].each do |type|
           eval("#{type}_entries").each do |entry|
-            filename = File.basename entry.to_s
-            temp_file = File.new(dir + '/' + filename, 'w+')
-            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.to_save = true
+            eval("design.#{type}").build(:file => get_temp_file(zip_file, dir, entry))
           end
         end
       }
@@ -149,4 +159,11 @@ class Admin::DesignsController < OrbitBackendController
     }
   end
 
+  def get_temp_file(zip_file, dir, entry)
+    filename = File.basename(entry.to_s)
+    temp_file = File.new(dir + '/' + filename, 'w+') 
+    temp_file.write (zip_file.read entry ).force_encoding('UTF-8')
+    temp_file
+  end
+
 end

app/controllers/admin/purchases_controller.rb

@@ -71,8 +71,8 @@ class Admin::PurchasesController < ApplicationController
         Dir.mktmpdir('f_path') { |dir|
           
           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
+          build_file(orig_zip, zip_name, dir, design.css_default) if design.css_default
+          build_file(orig_zip, zip_name, dir, design.css_reset) if design.css_reset
           
           ['themes', 'javascripts', 'images'].each do |type|
             design.send(type).each do |object|