Commit d65bf4605e561b58d3bb8ddba0ffb335e3a4c768
1 parent
c4b02642
Exists in
spb-stable
and in
2 other branches
Fix milestone reopen
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Showing
2 changed files
with
3 additions
and
3 deletions
Show diff stats
app/services/milestones/reopen_service.rb
| 1 | module Milestones | 1 | module Milestones |
| 2 | class ReopenService < Milestones::BaseService | 2 | class ReopenService < Milestones::BaseService |
| 3 | def execute(milestone) | 3 | def execute(milestone) |
| 4 | - if milestone.reopen | 4 | + if milestone.activate |
| 5 | event_service.reopen_milestone(milestone, current_user) | 5 | event_service.reopen_milestone(milestone, current_user) |
| 6 | end | 6 | end |
| 7 | 7 |
app/services/milestones/update_service.rb
| 1 | module Milestones | 1 | module Milestones |
| 2 | class UpdateService < Milestones::BaseService | 2 | class UpdateService < Milestones::BaseService |
| 3 | def execute(milestone) | 3 | def execute(milestone) |
| 4 | - state = params.delete('state_event') | 4 | + state = params.delete('state_event') || params.delete(:state_event) |
| 5 | 5 | ||
| 6 | case state | 6 | case state |
| 7 | - when 'reopen' | 7 | + when 'activate' |
| 8 | Milestones::ReopenService.new(project, current_user, {}).execute(milestone) | 8 | Milestones::ReopenService.new(project, current_user, {}).execute(milestone) |
| 9 | when 'close' | 9 | when 'close' |
| 10 | Milestones::CloseService.new(project, current_user, {}).execute(milestone) | 10 | Milestones::CloseService.new(project, current_user, {}).execute(milestone) |