app/views/videos/upload_form.html.erb @@ -21,7 +21,7 @@ Merb.logger.info("Compiling routes...") Merb::Router.prepare do |r| - r.resources :videos, :member => {:form => :get, :upload => :post, :done => :get, :state => :get, :add_to_queue => :get }, :collection => {:exp => :get} do |video| + r.resources :videos, :member => {:upload_form => :get, :upload => :post, :done => :get, :state => :get, :add_to_queue => :get }, :collection => {:exp => :get} do |video| video.resource :thumbnail # Using get requests right now for create and update video.match('/thumbnail/create').to(:controller => "thumbnail", :action => "create") config/router.rb app/views/videos/form.html.erb 1ff6472ef24532bd9270108c0bcb06988b4e77f4 Nick Merwin nick@lemurheavy.com http://github.com/newbamboo/panda/commit/ac62f3687861b315aee4ade0707e78bc58505b2c ac62f3687861b315aee4ade0707e78bc58505b2c 2009-10-23T15:55:55-07:00 2009-10-23T15:55:55-07:00 fixed upload_form route, renamed template 757f0b409613f4f1cc64ca589d5ee66a9dc58995 Nick Merwin nick@lemurheavy.com