consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merges master and fixes conflicts

Browse Source
This commit is contained in:
kikito
2015-09-03 12:02:16 +02:00
parent b23bd2c94d 572432f2cf
commit e2b405083c
7 changed files with 34 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
app/controllers/debates_controller.rb
View File

@@ -1,13 +1,15 @@
class DebatesController < ApplicationController
before_action :parse_order, :parse_tag_filter, only: :index
before_action :parse_order, only: :index
before_action :parse_tag_filter, only: :index
before_action :authenticate_user!, except: [:index, :show]
load_and_authorize_resource
respond_to :html, :js
def index
@debates = Debate.search(params).page(params[:page]).for_render.send("sort_by_#{@order}")
@tags = ActsAsTaggableOn::Tag.all
@debates = Debate.all
@debates = @debates.tagged_with(@tag_filter) if @tag_filter
@debates = @debates.page(params[:page]).for_render.send("sort_by_#{@order}")
@tag_cloud = Debate.tag_counts.order(taggings_count: :desc, name: :asc).limit(20)
set_debate_votes(@debates)
end
@@ -83,8 +85,9 @@ class DebatesController < ApplicationController
end
def parse_tag_filter
valid_tags = ActsAsTaggableOn::Tag.all.map(&:name)
@tag_filter = params[:tag] if valid_tags.include?(params[:tag])
if params[:tag].present?
@tag_filter = params[:tag] if ActsAsTaggableOn::Tag.where(name: params[:tag]).exists?
end
end
end