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

Simplify poll select options helper

Browse Source 
The `include_all` parameter was always used, and the option was
redundant because we already had a prompt offering the same
functionality.

I guess one possible reason was users would want to filter by all polls,
and having to click on "select a poll" to do so wasn't that intuitive.
So we're using "All" as the prompt instead.
This commit is contained in:
Javi Martín
2021-06-25 22:32:11 +02:00
parent 6b7792937f
commit ccbc708b5b
2 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/helpers/polls_helper.rb
View File

@@ -1,16 +1,11 @@
module PollsHelper module PollsHelper
def poll_select_options(include_all = nil) def poll_select_options
options = @polls.map do |poll| options = @polls.map do |poll|
[poll.name, current_path_with_query_params(poll_id: poll.id)] [poll.name, current_path_with_query_params(poll_id: poll.id)]
end end
options << all_polls if include_all
options_for_select(options, request.fullpath) options_for_select(options, request.fullpath)
end end
def all_polls
[I18n.t("polls.all"), admin_questions_path]
end
def poll_dates(poll) def poll_dates(poll)
if poll.starts_at.blank? || poll.ends_at.blank? if poll.starts_at.blank? || poll.ends_at.blank?
I18n.t("polls.no_dates") I18n.t("polls.no_dates")

4
app/views/admin/poll/questions/_filter.html.erb
View File

@@ -1,7 +1,7 @@
<%= form_tag "", method: :get do %> <%= form_tag "", method: :get do %>
<%= label_tag :poll_id, t("admin.questions.index.filter_poll") %> <%= label_tag :poll_id, t("admin.questions.index.filter_poll") %>
<%= select_tag "poll_id", <%= select_tag "poll_id",
poll_select_options(true), poll_select_options,
prompt: t("admin.questions.index.select_poll"), prompt: t("polls.all"),
class: "js-location-changer" %> class: "js-location-changer" %>
<% end %> <% end %>