Merge branch 'master' into backport-2588-fix_supports_filter

This commit is contained in:
Alberto
2018-07-26 13:44:20 +02:00
committed by GitHub
53 changed files with 1354 additions and 115 deletions

View File

@@ -35,21 +35,21 @@
<table class="table-for-mobile">
<thead>
<tr>
<th><%= t("admin.budget_investments.index.table_id") %></th>
<th class="small-3"><%= t("admin.budget_investments.index.table_title") %></th>
<th><%= t("admin.budget_investments.index.table_supports") %></th>
<th><%= t("admin.budget_investments.index.table_admin") %></th>
<th><%= t("admin.budget_investments.index.list.id") %></th>
<th class="small-3"><%= t("admin.budget_investments.index.list.title") %></th>
<th><%= t("admin.budget_investments.index.list.supports") %></th>
<th><%= t("admin.budget_investments.index.list.admin") %></th>
<th>
<%= t("admin.budget_investments.index.table_valuation_group") %>
<%= t("admin.budget_investments.index.table_valuator") %>
<%= t("admin.budget_investments.index.list.valuation_group") %>
<%= t("admin.budget_investments.index.list.valuator") %>
</th>
<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_evaluation") %></th>
<th class="text-center"><%= t("admin.budget_investments.index.table_selection") %></th>
<th><%= t("admin.budget_investments.index.list.geozone") %></th>
<th><%= t("admin.budget_investments.index.list.feasibility") %></th>
<th class="text-center"><%= t("admin.budget_investments.index.list.valuation_finished") %></th>
<th class="text-center"><%= t("admin.budget_investments.index.list.visible_to_valuators") %></th>
<th class="text-center"><%= t("admin.budget_investments.index.list.selected") %></th>
<% if params[:filter] == "selected" %>
<th class="text-center"><%= t("admin.budget_investments.index.table_incompatible") %></th>
<th class="text-center"><%= t("admin.budget_investments.index.list.incompatible") %></th>
<% end %>
</tr>
</thead>