From 4c58104a6522bd0eecd748ea95ee0bea56c7ad63 Mon Sep 17 00:00:00 2001 From: James Mason Date: Tue, 13 Feb 2018 10:38:30 -0800 Subject: [PATCH] Remove blind_voting overreach The 'Blind Voting' feature is described as: > you do not want to show voting results and voters prior to user > submitting a vote. It does not imply or suggest that speaker or submitter names should be hidden (especially from admins). Resolves https://github.com/openSUSE/osem/issues/1984 --- app/views/admin/events/_proposal.html.haml | 26 +++++++++------------- app/views/admin/events/index.html.haml | 22 +++++++----------- 2 files changed, 18 insertions(+), 30 deletions(-) diff --git a/app/views/admin/events/_proposal.html.haml b/app/views/admin/events/_proposal.html.haml index f5107b47..4ae1676f 100644 --- a/app/views/admin/events/_proposal.html.haml +++ b/app/views/admin/events/_proposal.html.haml @@ -122,26 +122,20 @@ %td %b Submitter %td - - if @program.show_voting? - = link_to @event.submitter.name, admin_user_path(@event.submitter) - ( - = link_to @event.submitter.email, "mailto: #{@event.submitter.email}" - ) - - else - %i Hidden + = link_to @event.submitter.name, admin_user_path(@event.submitter) + ( + = link_to @event.submitter.email, "mailto: #{@event.submitter.email}" + ) %tr %td %b Speakers %td - - if @program.show_voting? - - @event.speakers.each do |speaker| - %div - = link_to speaker.name, admin_user_path(speaker) - ( - = link_to speaker.email, "mailto: #{speaker.email}" - ) - - else - %i Hidden + - @event.speakers.each do |speaker| + %div + = link_to speaker.name, admin_user_path(speaker) + ( + = link_to speaker.email, "mailto: #{speaker.email}" + ) %tr %td %b Biographies diff --git a/app/views/admin/events/index.html.haml b/app/views/admin/events/index.html.haml index f78a8e9d..304bc726 100644 --- a/app/views/admin/events/index.html.haml +++ b/app/views/admin/events/index.html.haml @@ -117,22 +117,16 @@ - else - bgcolor = '' %td{ style: "background-color: #{bgcolor}" } - - if @program.show_voting? - - unless event.submitter.nil? - = link_to event.submitter.name, admin_user_path(event.submitter) - - if event.submitter.registrations.count < 1 - (Unregistered!) - - else - Unknown submitter + - unless event.submitter.nil? + = link_to event.submitter.name, admin_user_path(event.submitter) + - if event.submitter.registrations.count < 1 + (Unregistered!) - else - %i Hidden + Unknown submitter %td - - if @program.show_voting? - - event.speakers_ordered.each do |speaker| - .speaker - = link_to speaker.name, admin_user_path(speaker) - - else - %i Hidden + - event.speakers_ordered.each do |speaker| + .speaker + = link_to speaker.name, admin_user_path(speaker) - if @program.languages.present? %td