Mark track state as not null and add default value

The regular tracks are marked as 'confirmed'

app/controllers/admin/tracks_controller.rb

@@ -19,6 +19,7 @@ module Admin
 
     def create
       @track = @program.tracks.new(track_params)
+      @track.state = 'confirmed'
       if @track.save
         redirect_to admin_conference_program_tracks_path(conference_id: @conference.short_title),
                     notice: 'Track successfully created.'

app/controllers/tracks_controller.rb

@@ -18,7 +18,6 @@ class TracksController < ApplicationController
   def create
     @track = @program.tracks.new(track_params)
     @track.submitter = current_user
-    @track.state = 'new'
     @track.cfp_active = false
     if @track.save
       redirect_to conference_program_tracks_path(conference_id: @conference.short_title),

app/models/track.rb

@@ -25,10 +25,10 @@ class Track < ActiveRecord::Base
             inclusion: { in: %w(new to_accept accepted confirmed to_reject rejected canceled withdrawn) },
             if: :self_organized?
   validates :cfp_active, inclusion: { in: [true, false] }, if: :self_organized?
-  validates :start_date, presence: true, if: :accepted_or_confirmed?
-  validates :end_date, presence: true, if: :accepted_or_confirmed?
-  validates :room, presence: true, if: :accepted_or_confirmed?
-  validate :valid_dates, if: :accepted_or_confirmed?
+  validates :start_date, presence: true, if: :self_organized_and_accepted_or_confirmed?
+  validates :end_date, presence: true, if: :self_organized_and_accepted_or_confirmed?
+  validates :room, presence: true, if: :self_organized_and_accepted_or_confirmed?
+  validate :valid_dates, if: :self_organized_and_accepted_or_confirmed?
 
   before_validation :capitalize_color
 
@@ -129,12 +129,12 @@ class Track < ActiveRecord::Base
   end
 
   ##
-  # Checks if the track is accepted or confirmed
+  # Checks if a self-organized track is accepted or confirmed
   # ====Returns
   # * +true+ -> If the track's state is 'accepted' or 'confirmed'
   # * +false+ -> If the track's state is neither 'accepted' nor 'confirmed'
-  def accepted_or_confirmed?
-    accepted? || confirmed?
+  def self_organized_and_accepted_or_confirmed?
+    self_organized? && (accepted? || confirmed?)
   end
 
   private

app/views/admin/tracks/index.html.haml

@@ -42,7 +42,7 @@
               - if track.self_organized?
                 = track.state
               - else
-                N/A
+                = track.state.humanize
             %td
               - if track.self_organized?
                 = check_box_tag "#{@conference.short_title}_#{track.short_name}", track.id, track.cfp_active,