Merge pull request #1087 from consul/spending_proposal_admin_ui

Spending proposal admin ui
This commit is contained in:
Juanjo Bazán
2016-04-25 18:50:03 +02:00
4 changed files with 13 additions and 1 deletions

View File

@@ -7,7 +7,7 @@ class Admin::SpendingProposalsController < Admin::BaseController
load_and_authorize_resource
def index
@spending_proposals = SpendingProposal.scoped_filter(params, @current_filter).order(created_at: :desc).page(params[:page])
@spending_proposals = SpendingProposal.scoped_filter(params, @current_filter).order(cached_votes_up: :desc, created_at: :desc).page(params[:page])
end
def show

View File

@@ -29,6 +29,7 @@
label: false,
class: "js-submit-on-change" } %>
</div>
<div class="small-12 medium-3 column">
<%= select_tag :tag_name,
options_for_select(spending_proposal_tags_select_options, params[:tag_name]),
@@ -69,6 +70,9 @@
<td class="small">
<%= geozone_name(spending_proposal) %>
</td>
<td class="small">
<%= t("admin.spending_proposals.index.feasibility.#{spending_proposal.feasibility}", price: spending_proposal.price) %>
</td>
</tr>
<% end %>
</table>

View File

@@ -170,6 +170,10 @@ en:
no_admin_assigned: No admin assigned
no_valuators_assigned: No valuators assigned
summary_link: "Summary"
feasibility:
feasible: "Feasible (%{price})"
not_feasible: "Not feasible"
undefined: "Undefined"
show:
assigned_admin: Assigned administrator
assigned_valuators: Assigned valuators

View File

@@ -170,6 +170,10 @@ es:
no_admin_assigned: Sin admin asignado
no_valuators_assigned: Sin evaluador
summary_link: "Resumen"
feasibility:
feasible: "Viable (%{price})"
not_feasible: "Inviable"
undefined: "Sin definir"
show:
assigned_admin: Administrador asignado
assigned_valuators: Evaluadores asignados