consul/grecia
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1978 from consul/officing_requested_changes

Browse Source 
Officing requested changes
This commit is contained in:
BertoCQ
2017-10-04 14:20:36 +02:00
committed by GitHub
parent 05df996078 85695d51bb
commit 4e99012f8b
5 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/admin/poll/shifts_controller.rb
View File

@@ -30,7 +30,7 @@ class Admin::Poll::ShiftsController < Admin::Poll::BaseController
end end
def search_officers def search_officers
@officers = User.search(params[:search]).order(username: :asc) @officers = User.search(params[:search]).order(username: :asc).select { |o| o.poll_officer? == true }
end end
private private

2
config/locales/en/admin.yml
View File

@@ -606,7 +606,7 @@ en:
index: index:
title: "Results" title: "Results"
no_results: "There are no results" no_results: "There are no results"
table_whites: "Blank ballots" table_whites: "Totally blank ballots"
table_nulls: "Invalid ballots" table_nulls: "Invalid ballots"
table_total: "Total ballots" table_total: "Total ballots"
table_answer: Answer table_answer: Answer

4
config/locales/en/officing.yml
View File

@@ -29,7 +29,7 @@ en:
date: "Date" date: "Date"
select_booth: "Select booth" select_booth: "Select booth"
select_date: "Select date" select_date: "Select date"
ballots_white: "Blank ballots" ballots_white: "Totally blank ballots"
ballots_null: "Invalid ballots" ballots_null: "Invalid ballots"
ballots_total: "Total ballots" ballots_total: "Total ballots"
submit: "Save" submit: "Save"
@@ -40,7 +40,7 @@ en:
results: Results results: Results
table_answer: Answer table_answer: Answer
table_votes: Votes table_votes: Votes
table_whites: "Blank ballots" table_whites: "Totally blank ballots"
table_nulls: "Invalid ballots" table_nulls: "Invalid ballots"
table_total: "Total ballots" table_total: "Total ballots"
residence: residence:

2
config/locales/es/admin.yml
View File

@@ -606,7 +606,7 @@ es:
index: index:
title: "Resultados" title: "Resultados"
no_results: "No hay resultados" no_results: "No hay resultados"
table_whites: Papeletas en blanco table_whites: Papeletas totalmente en blanco
table_nulls: Papeletas nulas table_nulls: Papeletas nulas
table_total: Papeletas totales table_total: Papeletas totales
table_answer: Respuesta table_answer: Respuesta

4
config/locales/es/officing.yml
View File

@@ -29,7 +29,7 @@ es:
date: "Día" date: "Día"
select_booth: "Elige urna" select_booth: "Elige urna"
select_date: "Elige día" select_date: "Elige día"
ballots_white: "Papeletas en blanco" ballots_white: "Papeletas totalmente en blanco"
ballots_null: "Papeletas nulas" ballots_null: "Papeletas nulas"
ballots_total: "Papeletas totales" ballots_total: "Papeletas totales"
submit: "Guardar" submit: "Guardar"
@@ -40,7 +40,7 @@ es:
results: "Resultados" results: "Resultados"
table_answer: Respuesta table_answer: Respuesta
table_votes: Votos table_votes: Votos
table_whites: Papeletas en blanco table_whites: Papeletas totalmente en blanco
table_nulls: Papeletas nulas table_nulls: Papeletas nulas
table_total: Papeletas totales table_total: Papeletas totales
residence: residence: