Permalink
Browse files

represents essence track annotation bug and path to fix

  • Loading branch information...
1 parent 9a5452d commit 2da4946192c144fca66add62384daf67ae8ad26e @aviflombaum committed Apr 12, 2012
Showing with 6 additions and 2 deletions.
  1. +1 −1 app/models/essence_track.rb
  2. +5 −1 app/views/assets/_essence_tracks.haml
@@ -10,7 +10,7 @@ class EssenceTrack < ActiveRecord::Base
accepts_nested_attributes_for :essence_track_identifiers, :allow_destroy => :true
accepts_nested_attributes_for :annotations, :allow_destroy => :true
- DISPLAY_FIELDS = ["Identifier", "Standard", "Encoding", "Data Rate", "Time Start", "Duration", "Bit Depth", "Sampling Rate", "Frame Size", "Aspect Ratio", "Frame Rate", "Language", "Annotation"].map{|f| [f, ("" + f.gsub(' ', '').underscore).to_sym]}.freeze
+ DISPLAY_FIELDS = ["Identifier", "Standard", "Encoding", "Data Rate", "Time Start", "Duration", "Bit Depth", "Sampling Rate", "Frame Size", "Aspect Ratio", "Frame Rate", "Language"].map{|f| [f, ("" + f.gsub(' ', '').underscore).to_sym]}.freeze
xml_string "essenceTrackType"
xml_subelements "essenceTrackIdentifier", :essence_track_identifiers
@@ -10,4 +10,8 @@
%tr{:class=>cycle('even','odd')}
%th= name
- instantiation.essence_tracks.each do |track|
- %td= auto_link(h(track.send(sym)).gsub(/\r\n|\r|\n/, "<br />"))
+ %td= auto_link(h(track.send(sym)).gsub(/\r\n|\r|\n/, "<br />"))
+ %tr{:class=>cycle('even','odd')}
+ %th Annotations
+ - instantiation.essence_tracks.each do |track|
+ %td= track.annotations.collect{|a| a.annotation}.join("\n")

0 comments on commit 2da4946

Please sign in to comment.