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

Styles for filters. Refactor commentable action.

Browse Source
This commit is contained in:
taitus
2017-08-01 15:06:07 +02:00
parent 6e12f2cddf
commit dc5584086a
4 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/stylesheets/layout.scss
View File

@@ -590,7 +590,7 @@ header {
text-align: left; text-align: left;
@include breakpoint(medium) { @include breakpoint(medium) {
margin-right: $line-height * 1.5; margin-right: rem-calc(24);
} }
&:hover { &:hover {

13
app/controllers/concerns/commentable_actions.rb
View File

@@ -4,15 +4,14 @@ module CommentableActions
include Search include Search
def index def index
@resources = @search_terms.present? ? resource_model.search(@search_terms) : resource_model.all @resources = resource_model.all
@resources = @advanced_search_terms.present? ? @resources.filter(@advanced_search_terms) : @resources
@resources = @current_order == "recommended" && current_user.present? ? @resources.recommended(current_user) : @resources.for_render
@resources = @resources.search(@search_terms) if @search_terms.present?
@resources = @advanced_search_terms.present? ? @resources.filter(@advanced_search_terms) : @resources
@resources = @resources.tagged_with(@tag_filter) if @tag_filter @resources = @resources.tagged_with(@tag_filter) if @tag_filter
@resources = if @current_order == "recommended" && current_user.present?
@resources.recommended(current_user).page(params[:page]).send("sort_by_#{@current_order}") @resources = @resources.page(params[:page]).send("sort_by_#{@current_order}")
else
@resources.page(params[:page]).for_render.send("sort_by_#{@current_order}")
end
index_customization if index_customization.present? index_customization if index_customization.present?

2
app/models/debate.rb
View File

@@ -49,7 +49,7 @@ class Debate < ActiveRecord::Base
def self.recommended(user) def self.recommended(user)
debates_list = where("author_id != ?", user.id) debates_list = where("author_id != ?", user.id)
#same as "with_tagged(user.interests, any: true)" # same as tagged_with(user.interests, any: true)
debates_list_with_tagged = debates_list.joins(:tags).where('taggings.taggable_type = ?', self.name).where('tags.name IN (?)', user.interests) debates_list_with_tagged = debates_list.joins(:tags).where('taggings.taggable_type = ?', self.name).where('tags.name IN (?)', user.interests)
if debates_list_with_tagged.any? if debates_list_with_tagged.any?
debates_list = debates_list_with_tagged debates_list = debates_list_with_tagged

1
app/models/proposal.rb
View File

@@ -59,6 +59,7 @@ class Proposal < ActiveRecord::Base
def self.recommended(user) def self.recommended(user)
proposals_list = where("author_id != ?", user.id) proposals_list = where("author_id != ?", user.id)
# same as tagged_with(user.interests, any: true)
proposals_list_with_tagged = proposals_list.joins(:tags).where('taggings.taggable_type = ?', self.name) proposals_list_with_tagged = proposals_list.joins(:tags).where('taggings.taggable_type = ?', self.name)
.where('tags.name IN (?)', user.interests) .where('tags.name IN (?)', user.interests)
if proposals_list_with_tagged.any? if proposals_list_with_tagged.any?