Skip to content

Commit

Permalink
modified: Gemfile
Browse files Browse the repository at this point in the history
	-- removed some unused gems

modified:   app/models/audio_recording.rb
new file:   db/migrate/20121103085046_fix_bad_column_name.rb
modified:   test/fixtures/audio_recordings.yml
	-- added a fix for a bad column name

modified:   db/migrate/20121102043637_add_deleted_at_fields.rb
	-- removal of unecessary field added to permissions table

modified:   app/models/permission.rb
	-- fixed spelling bug

modified:   features/table_auditing.feature
modified:   features/step_definitions/database_steps.rb
	-- attempted to get unit tests working

modified:   features/support/env.rb
	-- added support for transactional fixtures
  • Loading branch information
atruskie committed Nov 4, 2012
1 parent f3c43f0 commit ed032bd
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions app/models/audio_recording.rb
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ class AudioRecording < ActiveRecord::Base

# attr
attr_accessible :bit_rate_bps, :channels, :data_length_bytes,
:duration_seconds, :hash, :media_type, :notes,
:duration_seconds, :file_hash, :media_type, :notes,
:recorded_date, :sample_rate_hertz, :status

# userstamp
Expand All @@ -37,7 +37,7 @@ class AudioRecording < ActiveRecord::Base
validates :media_type, :presence => true
validates :data_length_bytes, :presence => true, :numericality => { :only_integer => true, :greater_than_or_equal_to => 0 }

validates :hash, :presence => true
validates :file_hash, :presence => true

# uuid stuff
attr_protected :uuid
Expand Down
2 changes: 1 addition & 1 deletion app/models/permission.rb
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ class Permission < ActiveRecord::Base
def anonymous_permission_can_only_be_read_or_none
return unless self.user_id.nil?

return if self.read? || self.none?
return if self.reader? || self.none?

errors.add(:level, "The permission level can only be 'read' or 'none' for anonymous permissions")
end
Expand Down

0 comments on commit ed032bd

Please sign in to comment.