diff --git a/app/assets/templates/home.html b/app/assets/templates/home.html index fdcb0958..6da2242d 100644 --- a/app/assets/templates/home.html +++ b/app/assets/templates/home.html @@ -2,7 +2,8 @@

Welcome

{{welcomeMessage}}

-Projects -Sites -Photos -Audio Recordings +Projects +Sites +Photos +Audio Recordings + diff --git a/app/models/audio_recording.rb b/app/models/audio_recording.rb index a13700ff..df5d7918 100644 --- a/app/models/audio_recording.rb +++ b/app/models/audio_recording.rb @@ -7,11 +7,12 @@ class AudioRecording < ActiveRecord::Base # relations belongs_to :site has_many :audio_events + belongs_to :user, :class_name => 'User', :foreign_key => "uploader_id" # attr attr_accessible :bit_rate_bps, :channels, :data_length_bytes, :duration_seconds, :file_hash, :media_type, :notes, - :recorded_date, :sample_rate_hertz, :status + :recorded_date, :sample_rate_hertz, :status, :uploader_id # userstamp stampable @@ -21,7 +22,7 @@ class AudioRecording < ActiveRecord::Base # validation validates :uuid, :presence => true, :length => {:is => 36}, :uniqueness => { :case_sensitive => false } - validates :user, :presence => true + validates :uploader_id, :presence => true validates :recorded_date, :presence => true, :timeliness => {:on_or_before => lambda { Date.current }, :type => :date } diff --git a/app/models/project.rb b/app/models/project.rb index e8676c66..af9d2b34 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -22,7 +22,7 @@ class Project < ActiveRecord::Base validates_as_paranoid # validation - validates :name, :presence => true + validates :name, :presence => true, :uniqueness => { :case_sensitive => false } validates :urn, :presence => true end