@@ -20,7 +20,7 @@ class Video < ActiveRecord::Base end def update_panda_status(panda_video) - if encoding = panda_video.encoding_for_profile(PANDA_ENCODING) + if encoding = panda_video.find_encoding(PANDA_ENCODING) if encoding.status == 'success' self.filename = encoding.filename self.original_filename = encoding.original_filename app/models/video.rb @@ -1 +1 @@ -<p>Video uploaded! It will appear on the <%= link_to 'video page' video_path(@video) %> once it has finished encoding.</p> \ No newline at end of file +<p>Video uploaded! It will appear on the <%= link_to 'video page', video_path(@video) , :target => "_parent" %> once it has finished encoding.</p> \ No newline at end of file app/views/videos/done.html.erb @@ -12,7 +12,7 @@ ActionController::Routing::Routes.draw do |map| # You can have the root of your site routed by hooking up '' # -- just remember to delete public/index.html. # map.connect '', :controller => "welcome" - map.resource :videos, :member => {:status => :post, :upload => :get, :done => :get} + map.resources :videos, :member => {:status => :post, :upload => :get, :done => :get} # Allow downloading Web Service WSDL as a file with an extension # instead of a file named 'wsdl' config/routes.rb 3905e51f5c4c687a02abb2992f6dc751ffbdfcdd ca313faf873bf247bac33a284af555a8efdec3da Damien Tanner damien@new-bamboo.co.uk http://github.com/newbamboo/panda_example_rails/commit/01bab7eb0d04a5dbb3c9dde7a9e35c26949af290 01bab7eb0d04a5dbb3c9dde7a9e35c26949af290 2009-03-30T05:08:52-07:00 2009-03-30T05:08:52-07:00 Merge branch 'master' of git@github.com:newbamboo/panda_example_rails e07bf04baa81a7df7e83b387e5680807b2b0e149 Damien Tanner damien@new-bamboo.co.uk