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

Fixed misunderstanding

Browse Source
This commit is contained in:
16yuki0702
2018-07-27 16:34:00 +09:00
parent 57dbb0220a
commit c14fbf8540
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/helpers/admin_helper.rb
View File

@@ -21,11 +21,11 @@ module AdminHelper
end end
def menu_polls? def menu_polls?
%w[polls questions answers booth_assignments officer_assignments recounts results].include?(controller_name) %w[polls questions answers recounts results].include?(controller_name)
end end
def menu_booths? def menu_booths?
%w[officers booths shifts].include?(controller_name) %w[officers booths shifts booth_assignments officer_assignments].include?(controller_name)
end end
def menu_profiles? def menu_profiles?

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

@@ -7,7 +7,7 @@
<strong><%= t("admin.menu.title_polls") %></strong> <strong><%= t("admin.menu.title_polls") %></strong>
</a> </a>
<ul id="polls_menu" <%= "class=is-active" if menu_polls? || controller.class.parent == Admin::Poll::Questions::Answers %>> <ul id="polls_menu" <%= "class=is-active" if menu_polls? || controller.class.parent == Admin::Poll::Questions::Answers %>>
<li <%= "class=is-active" if %w(polls booth_assignments officer_assignments recounts results).include?(controller_name) %>> <li <%= "class=is-active" if %w(polls recounts results).include?(controller_name) %>>
<%= link_to t("admin.menu.polls"), admin_polls_path %> <%= link_to t("admin.menu.polls"), admin_polls_path %>
</li> </li>
@@ -25,7 +25,7 @@
<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? || controller_name == "polls" && action_name == "booth_assignments" %>>
<li <%= "class=is-active" if controller_name == "officers" %>> <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>
@@ -35,7 +35,7 @@
</li> </li>
<li <%= "class=is-active" if (controller_name == "polls" && action_name == "booth_assignments") || <li <%= "class=is-active" if (controller_name == "polls" && action_name == "booth_assignments") ||
(controller_name == "booth_assignments" && action_name == "manage") %>> controller_name == "booth_assignments" %>>
<%= link_to t("admin.menu.poll_booth_assignments"), booth_assignments_admin_polls_path %> <%= link_to t("admin.menu.poll_booth_assignments"), booth_assignments_admin_polls_path %>
</li> </li>