diff --git a/app/controllers/budgets_controller.rb b/app/controllers/budgets_controller.rb new file mode 100644 index 000000000..db05aafea --- /dev/null +++ b/app/controllers/budgets_controller.rb @@ -0,0 +1,13 @@ +class BudgetsController < ApplicationController + + load_and_authorize_resource + respond_to :html, :js + + def show + end + + def index + @budgets = @budgets.order(:created_at) + end + +end diff --git a/app/helpers/budget_helper.rb b/app/helpers/budget_helper.rb new file mode 100644 index 000000000..47dbbca98 --- /dev/null +++ b/app/helpers/budget_helper.rb @@ -0,0 +1,8 @@ +module BudgetHelper + def format_price(budget, number) + number_to_currency(number, + precision: 0, + locale: I18n.default_locale, + unit: budget.currency_symbol) + end +end diff --git a/app/models/abilities/common.rb b/app/models/abilities/common.rb index 0d1bfd4b9..f2c5ec720 100644 --- a/app/models/abilities/common.rb +++ b/app/models/abilities/common.rb @@ -18,9 +18,6 @@ module Abilities end can [:retire_form, :retire], Proposal, author_id: user.id - can :read, SpendingProposal - can :read, Budget::Investment - can :create, Comment can :create, Debate can :create, Proposal diff --git a/app/models/abilities/everyone.rb b/app/models/abilities/everyone.rb index 21e142c05..327210de8 100644 --- a/app/models/abilities/everyone.rb +++ b/app/models/abilities/everyone.rb @@ -6,6 +6,8 @@ module Abilities can [:read, :map], Debate can [:read, :map, :summary], Proposal can :read, Comment + can :read, Budget + can :read, Budget::Investment can :read, SpendingProposal can :read, Legislation can :read, User diff --git a/app/models/budget.rb b/app/models/budget.rb index b234a8b73..dfcba3214 100644 --- a/app/models/budget.rb +++ b/app/models/budget.rb @@ -1,8 +1,11 @@ class Budget < ActiveRecord::Base + include Sanitizable + VALID_PHASES = %W{on_hold accepting selecting balloting finished} validates :phase, inclusion: { in: VALID_PHASES } + validates :currency_symbol, presence: true has_many :investments has_many :ballots diff --git a/app/views/budgets/index.html.erb b/app/views/budgets/index.html.erb new file mode 100644 index 000000000..d1f9ebd63 --- /dev/null +++ b/app/views/budgets/index.html.erb @@ -0,0 +1,7 @@ +