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

merges with master and fixes conflicts

Browse Source
This commit is contained in:
kikito
2015-10-31 17:09:52 +01:00
parent ddc8097e7d 36e3ee0c5b
commit 2fab210ac8
87 changed files with 1747 additions and 1343 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/proposals_controller.rb
View File

@@ -13,7 +13,7 @@ class ProposalsController < ApplicationController
respond_to :html, :js
def index_customization
@featured_proposals = Proposal.all.sort_by_confidence_score.limit(3) if @search_terms.blank?
@featured_proposals = Proposal.all.sort_by_confidence_score.limit(3) if (@search_terms.blank? && @tag_filter.blank?)
if @featured_proposals.present?
set_featured_proposal_votes(@featured_proposals)
@resources = @resources.where('proposals.id NOT IN (?)', @featured_proposals.map(&:id))