* added recurring_mode to music_session for recurring sessions
This commit is contained in:
parent
24117c1b67
commit
027fd61606
|
|
@ -154,4 +154,5 @@ fix_connection_fields.sql
|
|||
session_ratings.sql
|
||||
scheduled_sessions.sql
|
||||
notification_scheduled_session.sql
|
||||
music_notation.sql
|
||||
music_notation.sql
|
||||
music_session_recurring_mode.sql
|
||||
|
|
@ -0,0 +1,2 @@
|
|||
ALTER TABLE music_sessions ADD COLUMN recurring_mode VARCHAR(50) NOT NULL DEFAULT 'once';
|
||||
UPDATE music_sessions SET recurring_mode = 'once' WHERE recurring_mode IS NULL;
|
||||
|
|
@ -88,7 +88,6 @@ require "jam_ruby/models/music_session_liker"
|
|||
require "jam_ruby/models/music_session_user_history"
|
||||
require "jam_ruby/models/music_session_perf_data"
|
||||
require "jam_ruby/models/music_notation"
|
||||
require "jam_ruby/models/recurring_session"
|
||||
require "jam_ruby/models/invitation"
|
||||
require "jam_ruby/models/fan_invitation"
|
||||
require "jam_ruby/models/friend_request"
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
module JamRuby
|
||||
class MusicSession < ActiveRecord::Base
|
||||
|
||||
attr_accessor :legal_terms
|
||||
attr_accessor :legal_terms, :recurring_mode
|
||||
|
||||
self.table_name = "music_sessions"
|
||||
|
||||
|
|
@ -34,6 +34,7 @@ module JamRuby
|
|||
validates :musician_access, :inclusion => {:in => [true, false]}
|
||||
validates :legal_terms, :inclusion => {:in => [true]}, :on => :create
|
||||
validates :creator, :presence => true
|
||||
validates :recurring_mode, :inclusion => {:in => RECURRING_MODES}
|
||||
validate :creator_is_musician
|
||||
|
||||
before_create :generate_share_token
|
||||
|
|
@ -43,6 +44,11 @@ module JamRuby
|
|||
|
||||
SEPARATOR = '|'
|
||||
|
||||
NO_RECURRING = "once"
|
||||
RECURRING_WEEKLY = "weekly"
|
||||
|
||||
RECURRING_MODES = [NO_RECURRING, RECURRING_WEEKLY]
|
||||
|
||||
def add_to_feed
|
||||
feed = Feed.new
|
||||
feed.music_session = self
|
||||
|
|
|
|||
|
|
@ -1,4 +0,0 @@
|
|||
module JamRuby
|
||||
class RecurringSession < ActiveRecord::Base
|
||||
end
|
||||
end
|
||||
Loading…
Reference in New Issue