From 6511a70ff8baec33b0ae0927d1fdfe694f41a373 Mon Sep 17 00:00:00 2001 From: Thorsten Eckel Date: Thu, 21 May 2015 16:50:28 +0200 Subject: [PATCH] Follow up: Implemented Ticket.process_pending. Fixed UnitTests for setting up new system. --- .../20150521134926_process_pending_tickets.rb | 13 ++++++++----- db/seeds.rb | 2 +- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/db/migrate/20150521134926_process_pending_tickets.rb b/db/migrate/20150521134926_process_pending_tickets.rb index 7b10ee2d0..12551f4ef 100644 --- a/db/migrate/20150521134926_process_pending_tickets.rb +++ b/db/migrate/20150521134926_process_pending_tickets.rb @@ -7,11 +7,14 @@ class ProcessPendingTickets < ActiveRecord::Migration pending_close_state = Ticket::State.find_by( name: 'pending close', ) - closed_state = Ticket::State.find_by( - name: 'closed', - ) - pending_close_state.next_state_id = closed_state.id - pending_close_state.save! + + if pending_close_state + closed_state = Ticket::State.find_by( + name: 'closed', + ) + pending_close_state.next_state_id = closed_state.id + pending_close_state.save! + end # add Ticket.process_pending Scheduler.create_or_update( diff --git a/db/seeds.rb b/db/seeds.rb index 0c4e2b6b9..5c788b65b 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -1366,7 +1366,7 @@ Ticket::State.create_if_not_exists( id: 3, name: 'pending reminder', state_type_ Ticket::State.create_if_not_exists( id: 4, name: 'closed', state_type_id: Ticket::StateType.where(name: 'closed').first.id ) Ticket::State.create_if_not_exists( id: 5, name: 'merged', state_type_id: Ticket::StateType.where(name: 'merged').first.id ) Ticket::State.create_if_not_exists( id: 6, name: 'removed', state_type_id: Ticket::StateType.where(name: 'removed').first.id, active: false ) -Ticket::State.create_if_not_exists( id: 7, name: 'pending close', state_type_id: Ticket::StateType.where(name: 'pending action').first.id, next_state_id: 5 ) +Ticket::State.create_if_not_exists( id: 7, name: 'pending close', state_type_id: Ticket::StateType.where(name: 'pending action').first.id, next_state_id: 4 ) Ticket::Priority.create_if_not_exists( id: 1, name: '1 low' ) Ticket::Priority.create_if_not_exists( id: 2, name: '2 normal' )