From 563cecb2e7991bbe9d51f1ddcdaefd3e3c685751 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juanjo=20Baz=C3=A1n?= Date: Tue, 15 Sep 2015 22:49:01 +0200 Subject: [PATCH 1/2] changes default order in moderation/proposals --- app/controllers/moderation/proposals_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/moderation/proposals_controller.rb b/app/controllers/moderation/proposals_controller.rb index 52b4222e9..e7cf86043 100644 --- a/app/controllers/moderation/proposals_controller.rb +++ b/app/controllers/moderation/proposals_controller.rb @@ -1,7 +1,7 @@ class Moderation::ProposalsController < Moderation::BaseController has_filters %w{pending_flag_review all with_ignored_flag}, only: :index - has_orders %w{created_at flags}, only: :index + has_orders %w{flags created_at}, only: :index before_filter :load_proposals, only: [:index, :moderate] From 6f67f9f95272650076bc436a37743d7bbec0c8ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juanjo=20Baz=C3=A1n?= Date: Tue, 15 Sep 2015 22:49:16 +0200 Subject: [PATCH 2/2] unifies names --- config/locales/moderation.es.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/locales/moderation.es.yml b/config/locales/moderation.es.yml index fbb2fba25..42dcb6da3 100644 --- a/config/locales/moderation.es.yml +++ b/config/locales/moderation.es.yml @@ -42,7 +42,7 @@ es: filters: all: Todos pending_flag_review: Pendientes - with_ignored_flag: Ignorados + with_ignored_flag: Marcados como revisados proposals: index: hide_proposals: Ocultar Propuestas