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

removes duplication between admin and valuators spending proposals

Browse Source
This commit is contained in:
rgarcia
2016-03-08 16:07:24 +01:00
parent 37c1c31bfe
commit a646d5ae6b
4 changed files with 3 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -36,4 +36,4 @@
<% end %>
<hr>
<%= render 'written_by_valuators' %>
<%= render 'valuation/spending_proposals/written_by_valuators' %>

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

@@ -30,4 +30,4 @@
<hr>
<%= render 'written_by_valuators' %>
<%= render 'valuation/spending_proposals/written_by_valuators' %>

0
app/views/admin/spending_proposals/_written_by_valuators.html.erb → app/views/valuation/spending_proposals/_written_by_valuators.html.erb
View File

55
app/views/valuation/spending_proposals/show.html.erb
View File

@@ -57,57 +57,4 @@
<%= link_to t("valuation.spending_proposals.show.edit_dossier"), edit_valuation_spending_proposal_path(@spending_proposal) %>
</p>
<p id="price">
<strong>
<%= t("valuation.spending_proposals.show.price") %>
(<%= t("valuation.spending_proposals.show.currency") %>):
</strong>
<% if @spending_proposal.price.present? %>
<%= @spending_proposal.price %>
<% else %>
<% t("valuation.spending_proposals.show.undefined") %>
<% end %>
</p>
<p id="price_first_year">
<strong>
<%= t("valuation.spending_proposals.show.price_first_year") %>
(<%= t("valuation.spending_proposals.show.currency") %>):
</strong>
<% if @spending_proposal.price_first_year.present? %>
<%= @spending_proposal.price_first_year %>
<% else %>
<%= t("valuation.spending_proposals.show.undefined") %>
<% end %>
</p>
<%= explanation_field @spending_proposal.price_explanation %>
<p id="time_scope">
<strong><%= t("valuation.spending_proposals.show.time_scope") %>:</strong>
<% if @spending_proposal.time_scope.present? %>
<%= @spending_proposal.time_scope %>
<% else %>
<%= t("valuation.spending_proposals.show.undefined") %>
<% end %>
</p>
<p id="feasibility">
<strong><%= t("valuation.spending_proposals.show.feasibility") %>:</strong>
<%= t("valuation.spending_proposals.show.#{@spending_proposal.feasibility}") %>
</p>
<%= explanation_field @spending_proposal.feasible_explanation %>
<% if @spending_proposal.valuation_finished %>
<p id="finished">
<strong><%= t("valuation.spending_proposals.show.valuation_finished") %></strong>
</p>
<% end %>
<% if @spending_proposal.internal_comments.present? %>
<h2><%= t("valuation.spending_proposals.show.internal_comments") %></h2>
<%= explanation_field @spending_proposal.internal_comments %>
<% end %>
<%= render 'written_by_valuators' %>