Merge branch 'master' into legislation-module-stable

2017-03-07 23:19:26 +01:00
parent 83e4c2bd03 15101c0d3e
commit d95f902fdf
25 changed files with 114 additions and 43 deletions
--- a/app/models/abilities/common.rb
+++ b/app/models/abilities/common.rb
@@ -46,6 +46,7 @@ module Abilities
        can :create, SpendingProposal

        can :create, Budget::Investment,               budget: { phase: "accepting" }
+        can :destroy, Budget::Investment,              budget: { phase: ["accepting", "reviewing"] }, author_id: user.id
        can :vote,   Budget::Investment,               budget: { phase: "selecting" }
        can [:show, :create], Budget::Ballot,          budget: { phase: "balloting" }
        can [:create, :destroy], Budget::Ballot::Line, budget: { phase: "balloting" }