Commit 160094e1 authored by Mario Manno's avatar Mario Manno
Browse files

update some AR query related code

parent 7b80a7f1

app/controllers/cfp/events_controller.rb

+2 −2
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ class Cfp::EventsController < ApplicationController 
  def index

    authorize! :submit, Event



    @events = current_user.person.events.all

    @events = current_user.person.events

    unless @events.nil?

      @events.map { |event| event.clean_event_attributes! }

    end
@@ -69,7 +69,7 @@ class Cfp::EventsController < ApplicationController 
  # PUT /cfp/events/1.xml

  def update

    authorize! :submit, Event

    @event = current_user.person.events.find(params[:id], readonly: false)

    @event = current_user.person.events.readonly(false).find(params[:id])

    params[:event].delete('recording_license')

    @event.recording_license = @event.conference.default_recording_license unless @event.recording_license

    if @event.accepted?

app/controllers/public/schedule_controller.rb

+5 −5
Original line number Diff line number Diff line
@@ -28,12 +28,12 @@ class Public::ScheduleController < ApplicationController 
    end

    @day = @conference.days[@day_index]



    @all_rooms = @conference.rooms.is_public.all

    @rooms = Array.new

    @events = Hash.new

    @skip_row = Hash.new

    @all_rooms = @conference.rooms.is_public

    @rooms = []

    @events = {}

    @skip_row = {}

    @all_rooms.each do |room|

      events = room.events.confirmed.no_conflicts.is_public.scheduled_on(@day).order(:start_time).all

      events = room.events.confirmed.no_conflicts.is_public.scheduled_on(@day).order(:start_time).to_a

      unless events.empty?

        @events[room] = events

        @skip_row[room] = 0

app/controllers/schedule_controller.rb

+2 −2
Original line number Diff line number Diff line
@@ -39,9 +39,9 @@ class ScheduleController < ApplicationController 
    @page_size = params[:page_size]

    @day = @conference.days.find(params[:date_id])

    @rooms = @conference.rooms.is_public.find(params[:room_ids])

    @events = Hash.new

    @events = {}

    @rooms.each do |room|

      @events[room] = room.events.accepted.is_public.scheduled_on(@day).order(:start_time).all

      @events[room] = room.events.accepted.is_public.scheduled_on(@day).order(:start_time)

    end



    respond_to do |format|

app/controllers/users_controller.rb

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ class UsersController < ApplicationController 
    @user = @person.user

    can_manage_user!



    @user.conference_users.select! { |cu|

    @user.conference_users.to_a.select! { |cu|

      can? :assign_user_roles, cu.conference

    }

  end

app/models/person.rb

+4 −4
Original line number Diff line number Diff line
@@ -89,19 +89,19 @@ class Person < ActiveRecord::Base 




  def events_in(conference)

    self.events.where(conference_id: conference.id).all

    self.events.where(conference_id: conference.id)

  end



  def events_as_presenter_in(conference)

    self.events.where(:"event_people.event_role" => ["speaker", "moderator"], conference_id: conference.id).all

    self.events.where(:"event_people.event_role" => ["speaker", "moderator"], conference_id: conference.id)

  end



  def events_as_presenter_not_in(conference)

    self.events.where(:"event_people.event_role" => ["speaker", "moderator"]).where("conference_id != ?", conference.id).all

    self.events.where(:"event_people.event_role" => ["speaker", "moderator"]).where("conference_id != ?", conference.id)

  end



  def public_and_accepted_events_as_speaker_in(conference)

    self.events.is_public.accepted.where(:"events.state" => :confirmed, :"event_people.event_role" => ["speaker", "moderator"], conference_id: conference.id).all

    self.events.is_public.accepted.where(:"events.state" => :confirmed, :"event_people.event_role" => ["speaker", "moderator"], conference_id: conference.id)

  end



  def role_state(conference)