diff --git a/app/controllers/api/v1/events_controller.rb b/app/controllers/api/v1/events_controller.rb index 0461877b..760785c0 100644 --- a/app/controllers/api/v1/events_controller.rb +++ b/app/controllers/api/v1/events_controller.rb @@ -6,6 +6,6 @@ class Api::V1::EventsController < Api::BaseController unless params[:conference_id].blank? events = events.where("conferences.guid" => params[:conference_id]) end - respond_with events + respond_with events.confirmed end end diff --git a/app/models/event.rb b/app/models/event.rb index 2760e7ae..c735cfb7 100644 --- a/app/models/event.rb +++ b/app/models/event.rb @@ -27,6 +27,8 @@ class Event < ActiveRecord::Base validates :title, :presence => true validates :abstract, :presence => true + scope :confirmed, where(:state => "confirmed") + state_machine :initial => :new do state :new state :review