X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=app%2Fcontrollers%2Fdemanders_controller.rb;h=92d4eeab7c47909211f18e06c022e51c206bcda1;hb=62f8aae6c10ff5bed6789d45abbd4887982560c9;hp=405000f255069a930c9a180d7bda0acb83fbd8bb;hpb=92e42b345715a552a4ce833b03ec68aed94792e0;p=pettanr%2Fpettanr.git

diff --git a/app/controllers/demanders_controller.rb b/app/controllers/demanders_controller.rb
index 405000f2..92d4eeab 100644
--- a/app/controllers/demanders_controller.rb
+++ b/app/controllers/demanders_controller.rb
@@ -1,6 +1,5 @@
 class DemandersController < ApplicationController
-  layout 'test' if MagicNumber['test_layout']
-  before_filter :authenticate_demand_user!, :only => [:index, :show, :new, :create, :edit, :update, :destroy, :req, :licenses_export, :artists_export, :original_pictures_export, :pictures_export]
+  before_filter :authenticate_demand_user!, :only => [:index, :show, :new, :create, :edit, :update, :destroy, :req, :licenses_export, :artists_export, :original_pictures_export, :pictures_export, :export]
   
   def index
     @demander = @demand_user.demander
@@ -143,4 +142,21 @@ class DemandersController < ApplicationController
     end
   end
   
+  def export
+    @demander = @demand_user.demander
+    date = ymd_to_time params[:date]
+    @exports = @demander.export(date)
+    respond_to do |format|
+      format.html { render :text  }
+      format.json { render :json => 
+        "{" +
+        "\"licenses\":" + @exports[:licenses].to_json + ", " + 
+        "\"artists\":" + @exports[:artists].to_json + ", " + 
+        "\"original_pictures\":" + OriginalPicture.list_as_json_text(@exports[:original_pictures]) + ", " + 
+        "\"pictures\":" + Picture.list_as_json_text(@exports[:pictures]) + 
+        "}" 
+      }
+    end
+  end
+  
 end