From 5fdbc7b8a675ef9ec10309b9f0a23237079f6f6b Mon Sep 17 00:00:00 2001 From: decabeza Date: Thu, 5 Oct 2017 16:29:57 +0200 Subject: [PATCH 1/2] removes icons on polls index view --- app/views/polls/_poll_group.html.erb | 30 +--------------------------- config/locales/en/general.yml | 4 ---- config/locales/es/general.yml | 4 ---- 3 files changed, 1 insertion(+), 37 deletions(-) diff --git a/app/views/polls/_poll_group.html.erb b/app/views/polls/_poll_group.html.erb index f8c105d90..a010b54d5 100644 --- a/app/views/polls/_poll_group.html.erb +++ b/app/views/polls/_poll_group.html.erb @@ -1,37 +1,9 @@ <% poll_group.each do |poll| %>
- <% if poll.answerable_by?(current_user) && poll.votable_by?(current_user) %> - <%= link_to poll, - class: "icon-poll-answer can-answer", - title: t("polls.index.can_answer") do %> - - <%= t("polls.index.can_answer") %> - - <% end %> - <% elsif current_user.nil? %> - <%= link_to new_user_session_path, - class: "icon-poll-answer not-logged-in", - title: t("polls.index.cant_answer_not_logged_in") do %> - - <%= t("polls.index.cant_answer_not_logged_in") %> - - <% end %> - <% elsif current_user.unverified? %> - <%= link_to verification_path, - class: "icon-poll-answer unverified", - title: t("polls.index.cant_answer_verify") do %> - - <%= t("polls.index.cant_answer_verify") %> - - <% end %> - <% elsif !poll.votable_by?(current_user) %> + <% if !poll.votable_by?(current_user) %>
"> <%= t("polls.index.already_answer") %>
- <% else %> -
"> - <%= t("polls.index.cant_answer") %> -
<% end %>
diff --git a/config/locales/en/general.yml b/config/locales/en/general.yml index 1796049eb..0d00a9028 100644 --- a/config/locales/en/general.yml +++ b/config/locales/en/general.yml @@ -466,10 +466,6 @@ en: no_geozone_restricted: "All city" geozone_restricted: "Districts" geozone_info: "Can participate people in the Census of: " - can_answer: "You can participate in this poll!" - cant_answer: "This poll is not available on your geozone" - cant_answer_not_logged_in: "You must sign in or sign up to participate" - cant_answer_verify: "You must verify your account in order to answer" already_answer: "You already have participated in this poll" section_header: icon_alt: Voting icon diff --git a/config/locales/es/general.yml b/config/locales/es/general.yml index d5997e746..d25edcef9 100644 --- a/config/locales/es/general.yml +++ b/config/locales/es/general.yml @@ -466,10 +466,6 @@ es: no_geozone_restricted: "Toda la ciudad" geozone_restricted: "Distritos" geozone_info: "Pueden participar las personas empadronadas en: " - can_answer: "¡Puedes participar en esta votación!" - cant_answer: "Esta votación no está disponible en tu zona" - cant_answer_not_logged_in: "Necesitas iniciar sesión o registrarte para participar" - cant_answer_verify: "Por favor verifica tu cuenta para poder responder" already_answer: "Ya has participado en esta votación" section_header: icon_alt: Icono de Votaciones From ad8f58993f71ebe18bc95a4f03e1e0f4b58994b1 Mon Sep 17 00:00:00 2001 From: decabeza Date: Thu, 5 Oct 2017 17:48:52 +0200 Subject: [PATCH 2/2] checks already answered polls only for users logged --- app/views/polls/_poll_group.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/polls/_poll_group.html.erb b/app/views/polls/_poll_group.html.erb index a010b54d5..380b35fc7 100644 --- a/app/views/polls/_poll_group.html.erb +++ b/app/views/polls/_poll_group.html.erb @@ -1,6 +1,6 @@ <% poll_group.each do |poll| %>
- <% if !poll.votable_by?(current_user) %> + <% if user_signed_in? && !poll.votable_by?(current_user) %>
"> <%= t("polls.index.already_answer") %>