From d446df44bac10f5680275de4b1f491ff7ba4929b Mon Sep 17 00:00:00 2001 From: Mateus Rambo Strey <mars11@inf.ufpr.br> Date: Fri, 11 Mar 2016 09:48:07 -0300 Subject: [PATCH] fix like button and display --- app/controllers/learning_objects_controller.rb | 2 +- app/views/learning_objects/_learning_object_horizontal.erb | 2 +- app/views/learning_objects/_learning_object_vertical.erb | 2 +- app/views/learning_objects/show.html.erb | 3 +-- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/app/controllers/learning_objects_controller.rb b/app/controllers/learning_objects_controller.rb index a218daef4..3995ddfb8 100644 --- a/app/controllers/learning_objects_controller.rb +++ b/app/controllers/learning_objects_controller.rb @@ -16,7 +16,7 @@ class LearningObjectsController < ApplicationController # GET /learning_objects/1 # GET /learning_objects/1.json def show - @liked = !@learning_object.liked?(current_user) if user_signed_in? + @liked = @learning_object.liked?(current_user) if user_signed_in? @reviews = Review.where(reviewable: @learning_object) end diff --git a/app/views/learning_objects/_learning_object_horizontal.erb b/app/views/learning_objects/_learning_object_horizontal.erb index 88857df3b..0fd539d88 100644 --- a/app/views/learning_objects/_learning_object_horizontal.erb +++ b/app/views/learning_objects/_learning_object_horizontal.erb @@ -25,7 +25,7 @@ <span class="author-label">Por <%= learning_object.get_metadata_value_of("dc.contributor.author") %></span><br/> <i class="fa fa-eye" data-toggle="tooltip" data-placement="bottom" title="Visualizações"></i><%= learning_object.views.count %> - <i class="fa fa-star votes-count" data-id="<%= learning_object.id %>" data-toggle="tooltip" data-placement="bottom" title="Curtidas"></i><%= learning_object.likes.count %><br> + <i class="fa fa-star" data-toggle="tooltip" data-placement="bottom" title="Curtidas"></i><span data-id="<%= learning_object.id %>" class="votes-count"><%= learning_object.likes.count %></span><br> <% unless learning_object.description.nil? %> <div class="learning-object-text"> diff --git a/app/views/learning_objects/_learning_object_vertical.erb b/app/views/learning_objects/_learning_object_vertical.erb index 73ed96733..3ce96004e 100644 --- a/app/views/learning_objects/_learning_object_vertical.erb +++ b/app/views/learning_objects/_learning_object_vertical.erb @@ -14,7 +14,7 @@ <div class="panel-body"> <h4 class="media-heading"><%= learning_object_title(learning_object) %></h4> <i class="fa fa-eye" data-toggle="tooltip" data-placement="bottom" title="Visualizações"></i><%= learning_object.views.size %> - <i class="fa fa-star votes-count" data-id="<%= learning_object.id %>" data-toggle="tooltip" data-placement="bottom" title="Curtidas"></i><%= learning_object.likes.size %> + <i class="fa fa-star" data-toggle="tooltip" data-placement="bottom" title="Curtidas"></i><span data-id="<%= learning_object.id %>" class="votes-count"><%= learning_object.likes.size %></span> <span class="author-label">Por <%= learning_object.get_metadata_value_of("dc.contributor.author") %></span> </div> </div> diff --git a/app/views/learning_objects/show.html.erb b/app/views/learning_objects/show.html.erb index d99230f7b..f622d1161 100644 --- a/app/views/learning_objects/show.html.erb +++ b/app/views/learning_objects/show.html.erb @@ -11,8 +11,7 @@ </div> <div class="pull-right" style="padding-right:122px"> <i class="fa fa-eye"></i><%= @learning_object.views.size %> - <i class="fa fa-thumbs-up votes-count" data-id="<%= @learning_object.id %>" data-toggle="tooltip" data-placement="bottom" title="Curtidas"></i><%= @learning_object.likes.size %> - + <i class="fa fa-thumbs-up" data-toggle="tooltip" data-placement="bottom" title="Curtidas"></i><span data-id="<%= @learning_object.id %>" class="votes-count"><%= @learning_object.likes.size %></span> </div> <br/><br/> <h2 class="title"><%= learning_object_title(@learning_object) %></h2> -- GitLab