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

Fix conflics after rebase

Browse Source
This commit is contained in:
iagirre
2018-02-13 15:33:18 +01:00
parent 01f421717d
commit b8cc10d218
14 changed files with 176 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
app/views/admin/budget_investments/_investments.html.erb
View File

@@ -27,8 +27,13 @@
<th><%= t("admin.budget_investments.index.table_geozone") %></th>
<th><%= t("admin.budget_investments.index.table_feasibility") %></th>
<th class="text-center"><%= t("admin.budget_investments.index.table_valuation_finished") %></th>
<th class="text-center"><%= t("admin.budget_investments.index.table_selection") %></th>
<% if params[:filter] == "selected" %>
<th class="text-center">
<% if params[:filter] == "valuating" %>
<%= t("admin.budget_investments.index.table_evaluation") %>
<% else %>
<%= t("admin.budget_investments.index.table_selection") %>
<% end %>
</th>
<th class="text-center"><%= t("admin.budget_investments.index.table_incompatible") %></th>
<% end %>
</tr>
@@ -76,7 +81,15 @@
<td class="small text-center">
<%= investment.valuation_finished? ? t("shared.yes"): t("shared.no") %>
</td>
<td class="small">
<td class="small text-center">
<% if params[:filter] == "valuating" %>
<%= form_for [:admin, investment.budget, investment], remote: true do |f| %>
<%= f.check_box :visible_to_valuators,
label: false,
class: "js-submit-on-change",
id: "budget_investment_visible_to_valuators" %>
<% end %>
<% else %>
<% if investment.selected? %>
<%= link_to_unless investment.budget.finished?,
t("admin.budget_investments.index.selected"),
@@ -104,6 +117,7 @@
remote: true,
class: "button small hollow expanded" %>
<% end %>
<% end %>
</td>
<% if params[:filter] == "selected" %>
<td class="small text-center">