diff --git a/app/models/spending_proposal.rb b/app/models/spending_proposal.rb index 9497dcae3..ba8ef7e78 100644 --- a/app/models/spending_proposal.rb +++ b/app/models/spending_proposal.rb @@ -34,15 +34,11 @@ class SpendingProposal < ActiveRecord::Base results = results.by_geozone(params[:geozone_id]) if params[:geozone_id].present? results = results.by_administrator(params[:administrator_id]) if params[:administrator_id].present? results = results.send(current_filter) if current_filter.present? - results = results.for_render - results + results.for_render end def self.by_geozone(geozone) - case geozone - when nil - self - when 'all' + if geozone == 'all' where(geozone_id: nil) else where(geozone_id: geozone.presence) diff --git a/app/views/admin/valuators/_valuator.html.erb b/app/views/admin/valuators/_valuator.html.erb index 72eec5304..68c2ae46d 100644 --- a/app/views/admin/valuators/_valuator.html.erb +++ b/app/views/admin/valuators/_valuator.html.erb @@ -3,5 +3,5 @@ <%= valuator.email %> <% unless valuator.persisted? %> <%= link_to t('admin.valuators.valuator.add'),{ controller: "admin/valuators", action: :create, user_id: valuator.user_id }, - method: :post, class: "button tiny radius success right" %> + method: :post, class: "button small success float-right" %> <% end %> diff --git a/config/locales/admin.en.yml b/config/locales/admin.en.yml index c44f216e4..0a78be2f1 100755 --- a/config/locales/admin.en.yml +++ b/config/locales/admin.en.yml @@ -73,10 +73,8 @@ en: valuators: index: title: Valuators - moderator: + valuator: add: Add - delete: Delete - show: Show search: email_placeholder: Search user by email search: Search diff --git a/config/locales/admin.es.yml b/config/locales/admin.es.yml index 986e8671a..2a57c92f7 100644 --- a/config/locales/admin.es.yml +++ b/config/locales/admin.es.yml @@ -73,10 +73,8 @@ es: valuators: index: title: Evaluadores - moderator: + valuator: add: AƱadir - delete: Borrar - show: Mostrar search: email_placeholder: Buscar usuario por email search: Buscar