From f9803ce9ca3e8b230477ef335d398c9820e8b381 Mon Sep 17 00:00:00 2001 From: Bertocq Date: Mon, 8 Jan 2018 22:56:11 +0100 Subject: [PATCH] Add drafting phase to budget model & translations --- app/models/budget.rb | 8 +++++++- config/locales/en/budgets.yml | 1 + config/locales/es/budgets.yml | 1 + 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/app/models/budget.rb b/app/models/budget.rb index 024602730..ce8bc4dfa 100644 --- a/app/models/budget.rb +++ b/app/models/budget.rb @@ -3,7 +3,8 @@ class Budget < ActiveRecord::Base include Measurable include Sluggable - PHASES = %w(accepting reviewing selecting valuating balloting reviewing_ballots finished).freeze + PHASES = %w(drafting accepting reviewing selecting valuating balloting + reviewing_ballots finished).freeze CURRENCY_SYMBOLS = %w(€ $ £ ¥).freeze validates :name, presence: true, uniqueness: true @@ -19,6 +20,7 @@ class Budget < ActiveRecord::Base before_validation :sanitize_descriptions scope :on_hold, -> { where(phase: %w(reviewing valuating reviewing_ballots")) } + scope :drafting, -> { where(phase: "drafting") } scope :accepting, -> { where(phase: "accepting") } scope :reviewing, -> { where(phase: "reviewing") } scope :selecting, -> { where(phase: "selecting") } @@ -41,6 +43,10 @@ class Budget < ActiveRecord::Base 80 end + def drafting? + phase == "drafting" + end + def accepting? phase == "accepting" end diff --git a/config/locales/en/budgets.yml b/config/locales/en/budgets.yml index 3710daf8a..bffa6965d 100644 --- a/config/locales/en/budgets.yml +++ b/config/locales/en/budgets.yml @@ -29,6 +29,7 @@ en: unselected_title: Investments not selected for balloting phase unselected: See investments not selected for balloting phase phase: + drafting: Draft (Not visible to the public) accepting: Accepting projects reviewing: Reviewing projects selecting: Selecting projects diff --git a/config/locales/es/budgets.yml b/config/locales/es/budgets.yml index 367bcecdc..d746772eb 100644 --- a/config/locales/es/budgets.yml +++ b/config/locales/es/budgets.yml @@ -29,6 +29,7 @@ es: unselected_title: Propuestas no seleccionadas para la votación final unselected: Ver las propuestas no seleccionadas para la votación final phase: + drafting: Borrador (No visible para el público) accepting: Presentación de proyectos reviewing: Revisión interna de proyectos selecting: Fase de apoyos