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

Fix Polls link in admin menu

Browse Source 
The link was marked as active and hidden by foundation when we were in
the "Booths Assignments" section.
This commit is contained in:
Javi Martín
2020-02-05 22:15:58 +01:00
parent 2b87b9ed19
commit 00484fe5f7
3 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/helpers/admin_helper.rb
View File

@@ -33,12 +33,14 @@ module AdminHelper
end end
def menu_polls? def menu_polls?
%w[polls active_polls recounts results questions answers].include?(controller_name) || controller.class.parent == Admin::Poll::Questions::Answers ||
controller.class.parent == Admin::Poll::Questions::Answers %w[polls active_polls recounts results questions answers].include?(controller_name) &&
action_name != "booth_assignments"
end end
def menu_booths? def menu_booths?
%w[officers booths shifts booth_assignments officer_assignments].include?(controller_name) %w[officers booths shifts booth_assignments officer_assignments].include?(controller_name) ||
controller_name == "polls" && action_name == "booth_assignments"
end end
def menu_profiles? def menu_profiles?

2
app/views/admin/_menu.html.erb
View File

@@ -57,7 +57,7 @@
<span class="icon-box"></span> <span class="icon-box"></span>
<strong><%= t("admin.menu.title_booths") %></strong> <strong><%= t("admin.menu.title_booths") %></strong>
</a> </a>
<ul id="booths_menu" <%= "class=is-active" if menu_booths? || controller_name == "polls" && action_name == "booth_assignments" %>> <ul id="booths_menu" <%= "class=is-active" if menu_booths? %>>
<li <%= "class=is-active" if %w[officers officer_assignments].include?(controller_name) %>> <li <%= "class=is-active" if %w[officers officer_assignments].include?(controller_name) %>>
<%= link_to t("admin.menu.poll_officers"), admin_officers_path %> <%= link_to t("admin.menu.poll_officers"), admin_officers_path %>
</li> </li>

6
spec/features/admin/poll/booth_assigments_spec.rb
View File

@@ -29,6 +29,12 @@ describe "Admin booths assignments" do
expect(page).to have_content(second_booth.name) expect(page).to have_content(second_booth.name)
end end
scenario "Does not hide the Polls menu", :js do
visit booth_assignments_admin_polls_path
within("#admin_menu") { expect(page).to have_link "Polls" }
end
scenario "Index do not show polls created by users from proposals dashboard" do scenario "Index do not show polls created by users from proposals dashboard" do
create(:poll, name: "Poll created by admin") create(:poll, name: "Poll created by admin")
create(:poll, name: "Poll from user's proposal", related_type: "Proposal") create(:poll, name: "Poll from user's proposal", related_type: "Proposal")