Commit 893864454c278228d78d7d6406a58852d0a3c778 didn't update
this as required.
---
rails/app/controllers/video_controller.rb | 4 +---
rails/app/views/video/rate_file.rxml | 2 +-
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/rails/app/controllers/video_controller.rb b/rails/app/controllers/video_controller.rb
index 9501320..8c4546b 100644
--- a/rails/app/controllers/video_controller.rb
+++ b/rails/app/controllers/video_controller.rb
@@ -108,9 +108,7 @@ class VideoController < ApplicationController
def rate_file
@content_subtitle = local("video::rate_file")
@vtf = Video_target_file.select_single({:id => params[:id]})
- @ver = Video_event_recording.select_single({:id => @vtf.event_recording_id})
- @event = Event.select_single({:event_id => @ver.event_id})
- @rec = Video_recording.select_single({:id => @ver.recording_id})
+ @event = Video_event_view.select_single({:event_id => @vtf.event_id})
@format = Video_target_format.select_single({:id => @vtf.target_format_id})
end
diff --git a/rails/app/views/video/rate_file.rxml b/rails/app/views/video/rate_file.rxml
index 352a8a0..5768f4d 100644
--- a/rails/app/views/video/rate_file.rxml
+++ b/rails/app/views/video/rate_file.rxml
@@ -1,6 +1,6 @@
xml.div({:id=>:data}) do
xml.h1(@content_subtitle)
- file = "#{@format.target_format_abbr}/#{@ver.event_recording_base_name.gsub(/^\/+/, '')}.#{@format.filename_extension.gsub(/^\.+/, '')}"
+ file = "#{@format.target_format_abbr}/#{@event.event_base_name.gsub(/^\/+/, '')}.#{@format.filename_extension.gsub(/^\.+/, '')}"
xml.h2 do
xml << local(:rating).capitalize
xml.a(file,:href => "#{@video_base}/#{file}")
--
1.7.5.4
Attachment:
signature.asc
Description: This is a digitally signed message part