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

allow officers to be created without a poll

Browse Source
This commit is contained in:
rgarcia
2016-09-25 10:21:58 +02:00
committed by kikito
parent fda2f3c89e
commit 3251e4944e
4 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -84,7 +84,7 @@
</li>
<li <%= 'class=active' if controller_name == 'officers' %>>
<%= link_to admin_poll_officers_path(Poll.last) do %>
<%= link_to admin_officers_path do %>
<span class="icon-user"></span><%= t('admin.menu.poll_officers') %>
<% end %>
</li>
@@ -95,11 +95,13 @@
<% end %>
</li>
<li <%= 'class=active' if controller_name == 'booths' %>>
<%= link_to admin_poll_booths_url(Poll.last) do %>
<span class="icon-user"></span><%= t('admin.menu.booths') %>
<% end %>
</li>
<% if Poll.any? %>
<li <%= 'class=active' if controller_name == 'booths' %>>
<%= link_to admin_poll_booths_url(Poll.last) do %>
<span class="icon-user"></span><%= t('admin.menu.booths') %>
<% end %>
</li>
<% end %>
<li <%= 'class=active' if controller_name == 'activity' %>>
<%= link_to admin_activity_path do %>

4
app/views/admin/poll/officers/index.html.erb
View File

@@ -1,7 +1,7 @@
<h2><%= t("admin.poll_officers.index.title") %></h2>
<div class="row">
<%= form_tag search_admin_poll_officers_path, method: :get, remote: true do %>
<%= form_tag search_admin_officers_path, method: :get, remote: true do %>
<div class="small-12 medium-6 column">
<%= text_field_tag :email, '', placeholder: t('admin.poll_officers.search.email_placeholder') %>
</div>
@@ -27,7 +27,7 @@
<td class="text-right">
<% if officer.persisted? %>
<%= link_to t('admin.poll_officers.officer.delete'),
admin_poll_officer_path(Poll.last, officer),
admin_officer_path(officer),
method: :delete,
class: "button hollow alert"
%>