Merge branch '134_create_moderator'

This commit is contained in:
Jose Manuel
2015-08-25 00:07:42 +01:00
11 changed files with 137 additions and 4 deletions

View File

@@ -16,6 +16,7 @@ en:
hidden_users: Hidden users
organizations: Organizations
officials: Officials
moderators: Moderators
stats: Statistics
organizations:
index:
@@ -104,3 +105,14 @@ en:
flash:
official_updated: 'Official position saved!'
official_destroyed: 'User is not an official anymore'
moderators:
index:
title: Moderators
search:
email_placeholder: 'Search user by email'
search: Search
user_not_found: 'User not found'
moderator:
delete: Delete
add: Add

View File

@@ -16,6 +16,7 @@ es:
hidden_users: Usuarios ocultos
organizations: Organizaciones
officials: Cargos públicos
moderators: Moderadores
stats: Estadísticas
organizations:
index:
@@ -104,3 +105,13 @@ es:
flash:
official_updated: 'Datos del cargo público guardados'
official_destroyed: 'Datos guardados: el usuario ya no es cargo público'
moderators:
index:
title: Moderadores
search:
email_placeholder: 'Buscar usuario por email'
search: Buscar
user_not_found: 'Usuario no encontrado'
moderator:
delete: Borrar
add: Añadir

View File

@@ -62,6 +62,10 @@ Rails.application.routes.draw do
end
resources :settings, only: [:index, :update]
resources :moderators, only: [:index] do
member { post :toggle }
collection { get :search }
end
end
namespace :moderation do