From 230393880764c9c12d53eef0ef9294a9cd3db808 Mon Sep 17 00:00:00 2001
From: Mateus Rambo Strey <mars11@inf.ufpr.br>
Date: Mon, 28 Mar 2016 09:41:04 -0300
Subject: [PATCH] fix user page when user is not logged in
---
app/helpers/users_helper.rb | 5 +++--
app/views/follows/_button.html.erb | 6 ++++--
app/views/users/_header.html.erb | 2 +-
3 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/app/helpers/users_helper.rb b/app/helpers/users_helper.rb
index dc9350af..f8435d14 100644
--- a/app/helpers/users_helper.rb
+++ b/app/helpers/users_helper.rb
@@ -1,7 +1,8 @@
module UsersHelper
def current_user_page?(user)
- current_user.id == user.id
+ return current_user.id == user.id if user_signed_in?
+ false
end
def learning_objects_number(learning_objects)
@@ -23,4 +24,4 @@ module UsersHelper
render "users/user_horizontal", user: user
end
-end
\ No newline at end of file
+end
diff --git a/app/views/follows/_button.html.erb b/app/views/follows/_button.html.erb
index ef4628ab..3dbe65b9 100644
--- a/app/views/follows/_button.html.erb
+++ b/app/views/follows/_button.html.erb
@@ -1,2 +1,4 @@
-<% follow_text = current_user.following?(followable) ? 'Deixar de seguir' : 'Seguir' %>
-<%= link_to follow_text, follow_user_path(id: current_user.id, followable_type: followable.class.name, followable_id: followable.id), method: :post, remote: true, class: 'btn btn-default follow-button' %>
+<% if user_signed_in? %>
+ <% follow_text = current_user.following?(followable) ? 'Deixar de seguir' : 'Seguir' %>
+ <%= link_to follow_text, follow_user_path(id: current_user.id, followable_type: followable.class.name, followable_id: followable.id), method: :post, remote: true, class: 'btn btn-default follow-button' %>
+<% end %>
diff --git a/app/views/users/_header.html.erb b/app/views/users/_header.html.erb
index 800656db..a61fd013 100644
--- a/app/views/users/_header.html.erb
+++ b/app/views/users/_header.html.erb
@@ -2,7 +2,7 @@
<div class="col-md-6">
<div class="media">
<div class="media-left">
- <% if current_user.id == user.id and current_user.provider == "email" %>
+ <% if user_signed_in? && current_user.id == user.id && current_user.provider == "email" %>
<%= link_to edit_user_registration_path do
image_tag user.avatar.url(:thumb), class: 'user-image'
end %>
--
GitLab