Skip to content

Commit

Permalink
Merge branch 'master' of github.com:PDaily/ClanCenter
Browse files Browse the repository at this point in the history
  • Loading branch information
pDaily committed Jul 27, 2015
2 parents 80d2b20 + 6a15d1f commit bd722af
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions app/controllers/home_controller.rb
Expand Up @@ -3,7 +3,7 @@ class HomeController < ApplicationController
load_resource :game_session
def index
authorize! :edit, GameSession
@game_sessions = GameSession.includes(:creator, :users, :game, :game_mode).filter(params.slice(:game_id, :game_mode_id, :sorted_by)).page params[:page]
@game_sessions = GameSession.active.includes(:creator, :users, :game, :game_mode).filter(params.slice(:game_id, :game_mode_id, :sorted_by)).page params[:page]
session[:game_sessions] = @game_sessions.to_param
@site_news = SiteNews.includes(:user).limit(5).order(created_at: :desc)
respond_to do |format|
Expand All @@ -13,15 +13,15 @@ def index
end

def all_games
@game_sessions = GameSession.includes(:users, :game, :game_mode).page params[:page]
@game_sessions = GameSession.active.includes(:users, :game, :game_mode).page params[:page]
session[:game_sessions] = @game_sessions.to_param
respond_to do |format|
format.js
end
end

def sort
@game_sessions = GameSession.includes(:creator, :users, :game, :game_mode).filter(params.slice(:game_id, :game_mode_id, :sorted_by)).page params[:page]
@game_sessions = GameSession.active.includes(:creator, :users, :game, :game_mode).filter(params.slice(:game_id, :game_mode_id, :sorted_by)).page params[:page]
session[:game_id] = params[:game_id]
session[:game_mode_id] = params[:game_mode_id]
respond_to do |format|
Expand Down

0 comments on commit bd722af

Please sign in to comment.