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

Uses SpendingProposal.filter_params in all admin views

Browse Source
This commit is contained in:
kikito
2016-03-14 16:16:29 +01:00
parent 769780e2cd
commit 11bcf375d2
3 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
app/views/admin/spending_proposals/edit.html.erb
View File

@@ -1,4 +1,4 @@
<%= link_to admin_spending_proposals_path(@spending_proposal), class: 'back' do %>
<%= link_to admin_spending_proposals_path(@spending_proposal, SpendingProposal.filter_params(params)), class: 'back' do %>
<i class="icon-angle-left"></i> <%= t("admin.spending_proposals.show.back") %>
<% end %>
@@ -6,7 +6,12 @@
<h2 id="form"><%= t("admin.spending_proposals.edit.classification") %></h2>
<%= form_for @spending_proposal, url: admin_spending_proposal_path(@spending_proposal) do |f| %>
<%= form_for @spending_proposal,
url: admin_spending_proposal_path(@spending_proposal) do |f| %>
<% SpendingProposal.filter_params(params).each do |filter_name, filter_value| %>
<%= hidden_field_tag filter_name, filter_value %>
<% end %>
<%= f.select(:administrator_id,
@admins.collect{ |a| [a.name_and_email, a.id ] },
@@ -24,15 +29,11 @@
placeholder: t("admin.spending_proposals.edit.tags_placeholder"),
class: 'js-tag-list' %>
<div class="row collapse">
<%= f.label :valuator_ids, t("admin.spending_proposals.edit.assigned_valuators") %>
<%= f.label :valuator_ids, t("admin.spending_proposals.edit.assigned_valuators") %>
<%= f.collection_check_boxes :valuator_ids, @valuators, :id, :email do |b| %>
<div class="small-12 medium-4 column end">
<%= b.label(title: b.object.name) { b.check_box + b.text } %>
</div>
<% end %>
</div>
<%= f.collection_check_boxes :valuator_ids, @valuators, :id, :email do |b| %>
<%= b.label(title: b.object.name) { b.check_box + b.text } %>
<% end %>
<p class="clear">
<%= f.submit(class: "button", value: t("admin.spending_proposals.edit.submit_button")) %>
@@ -41,4 +42,4 @@
<% end %>
<hr>
<%= render 'valuation/spending_proposals/written_by_valuators' %>
<%= render 'valuation/spending_proposals/written_by_valuators' %>

2
app/views/admin/spending_proposals/index.html.erb
View File

@@ -37,7 +37,7 @@
<strong><%= spending_proposal.id %></strong>
</td>
<td>
<%= link_to spending_proposal.title, admin_spending_proposal_path(spending_proposal) %>
<%= link_to spending_proposal.title, admin_spending_proposal_path(spending_proposal, SpendingProposal.filter_params(params)) %>
</td>
<td class="small">
<% if spending_proposal.administrator.present? %>

5
app/views/admin/spending_proposals/show.html.erb
View File

@@ -1,4 +1,4 @@
<%= link_to :back, class: 'back' do %>
<%= link_to admin_spending_proposals_path(SpendingProposal.filter_params(params)) do %>
<i class="icon-angle-left"></i> <%= t("admin.spending_proposals.show.back") %>
<% end %>
@@ -8,7 +8,8 @@
<p>
<%= link_to t("admin.spending_proposals.show.edit_classification"),
edit_admin_spending_proposal_path(@spending_proposal, anchor: "form") %>
edit_admin_spending_proposal_path(@spending_proposal,
{anchor: 'form'}.merge(SpendingProposal.filter_params(params))) %>
</p>
<p><strong><%= t("admin.spending_proposals.show.assigned_admin") %>:</strong>