Merge branch 'proposals' of github.com:AyuntamientoMadrid/participacion into proposals

This commit is contained in:
rgarcia
2015-09-12 12:47:42 +02:00
4 changed files with 12 additions and 4 deletions

View File

@@ -5,4 +5,5 @@ en:
official_level_3_name: "Level 3 official positions"
official_level_4_name: "Level 4 official positions"
official_level_5_name: "Level 5 official positions"
max_ratio_anon_votes_on_debates: "Max allowed percentage of anonymous votes per debate"
max_ratio_anon_votes_on_debates: "Max allowed percentage of anonymous votes per Debate"
max_votes_for_proposal_edit: "Number of votes where a Proposal is not editable anymore"

View File

@@ -5,4 +5,5 @@ es:
official_level_3_name: "Cargos públicos de nivel 3"
official_level_4_name: "Cargos públicos de nivel 4"
official_level_5_name: "Cargos públicos de nivel 5"
max_ratio_anon_votes_on_debates: "Porcentaje máximo de votos anónimos por debate"
max_ratio_anon_votes_on_debates: "Porcentaje máximo de votos anónimos por Debate"
max_votes_for_proposal_edit: "Número de votos en que una Propuesta deja de poderse editar"

View File

@@ -9,6 +9,7 @@ Setting.create(key: 'official_level_3_name', value: 'Directores generales')
Setting.create(key: 'official_level_4_name', value: 'Concejales')
Setting.create(key: 'official_level_5_name', value: 'Alcaldesa')
Setting.create(key: 'max_ratio_anon_votes_on_debates', value: '50')
Setting.create(key: 'max_votes_for_proposal_edit', value: '1000')
puts "Creating Users"

View File

@@ -1,6 +1,8 @@
# Default admin user (change password after first deploy to a server!)
admin = User.create!(username: 'admin', email: 'admin@madrid.es', password: '12345678', password_confirmation: '12345678', confirmed_at: Time.now, terms_of_service: "1")
admin.create_administrator
if Administrator.count == 0
admin = User.create!(username: 'admin', email: 'admin@madrid.es', password: '12345678', password_confirmation: '12345678', confirmed_at: Time.now, terms_of_service: "1")
admin.create_administrator
end
# Names for the moderation console, as a hint for moderators
# to know better how to assign users with official positions
@@ -12,3 +14,6 @@ Setting.create(key: 'official_level_5_name', value: 'Alcaldesa')
# Max percentage of allowed anonymous votes on a debate
Setting.create(key: 'max_ratio_anon_votes_on_debates', value: '50')
# Max votes where a proposal is still editable
Setting.create(key: 'max_votes_for_proposal_edit', value: '1000')