diff --git a/app/controllers/admin/spending_proposals_controller.rb b/app/controllers/admin/spending_proposals_controller.rb index bd139dc9a..9826ab17f 100644 --- a/app/controllers/admin/spending_proposals_controller.rb +++ b/app/controllers/admin/spending_proposals_controller.rb @@ -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 diff --git a/app/views/admin/spending_proposals/index.html.erb b/app/views/admin/spending_proposals/index.html.erb index cd30f121d..5bbcee57f 100644 --- a/app/views/admin/spending_proposals/index.html.erb +++ b/app/views/admin/spending_proposals/index.html.erb @@ -29,6 +29,7 @@ label: false, class: "js-submit-on-change" } %> +
<%= select_tag :tag_name, options_for_select(spending_proposal_tags_select_options, params[:tag_name]), @@ -69,6 +70,9 @@ <%= geozone_name(spending_proposal) %> + + <%= t("admin.spending_proposals.index.feasibility.#{spending_proposal.feasibility}", price: spending_proposal.price) %> + <% end %> diff --git a/config/locales/admin.en.yml b/config/locales/admin.en.yml index 32adadbd2..3a04b8a6a 100755 --- a/config/locales/admin.en.yml +++ b/config/locales/admin.en.yml @@ -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 diff --git a/config/locales/admin.es.yml b/config/locales/admin.es.yml index a3f8785e0..16dd2373a 100644 --- a/config/locales/admin.es.yml +++ b/config/locales/admin.es.yml @@ -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