merge with november_presentation

app/controllers/admin/app_auths_controller.rb

@@ -4,7 +4,7 @@ class Admin::AppAuthsController < ApplicationController
   before_filter :is_admin?
   
   def index
-    @roles = Role.all.entries
+    @user_roles = UserRole.all.entries
     apps = Purchase.where(:type =>"App")
     @app_auth_data = apps.entries.map do |app|
       app_c = eval(app.app_controller)

app/models/design/design.rb

@@ -24,6 +24,35 @@ class Design
   after_save :procs_embedded_objects
   # after_destroy :del_embedded_objects
  
+   # 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_filename}
+     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_filename.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
@@ -45,6 +74,7 @@ class Design
         files = eval(attrs.last)
     end
     attrs[0].each do |a|
+       
       if a[:id].blank? && !a[:file].blank?
         files.build(:file => a[:file], :to_save => true)
       else
@@ -86,12 +116,14 @@ class Design
         end
       end
     end
+    self.valid?
   end
   
   def process_object(object)
     if object.to_save
       if object.file_filename.nil?
-        new_object = self.send(object._type.downcase.pluralize).build(object)
+        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

app/views/admin/designs/_design_file.html.erb

@@ -18,7 +18,7 @@
   <% end %>
 </ul>
 <p class="new_file">
-<%= fields_for "design[" + field_name + "][]", object.send(field_name).build, :index => nil do |f| %>	
+<%= fields_for "design[new_files][" + field_name + "][]", object.send(field_name).build, :index => nil do |f| %>	
   <%= f.file_field :file, :class => "multi_files" %>
 </p>
 <% end %>

app/views/admin/designs/edit.html.erb

@@ -1,6 +1,6 @@
 <h1><%= t('admin.editing_design') %></h1>
 
-<%= form_for @design, :url => admin_design_path(@design) do |f| %>
+<%= form_for @design, :url => admin_design_path(@design),:html => {:multipart => true} do |f| %>
   <%= f.error_messages %>
   <%= render :partial => "form", :locals => { :f => f } %>
   <p>

app/views/admin/designs/new.html.erb

@@ -1,6 +1,6 @@
 <h1><%= t('admin.new_design') %></h1>
 
-<%= form_for :design, :url => admin_designs_path do |f| %>
+<%= form_for :design, :url => admin_designs_path,:html => {:multipart => true} do |f| %>
   <%= f.error_messages %>
   <%= render :partial => "form", :locals => { :f => f } %>