From 323e279ce5c3e39be8b29f1dd796dd47c7fdb341 Mon Sep 17 00:00:00 2001
From: Martin Edenhofer <me@edenhofer.de>
Date: Wed, 2 Jan 2013 00:35:46 +0100
Subject: [PATCH] Renamed ticket_state.ticket_state_type_id to
 ticket_state.state_type_id.

---
 app/controllers/tickets_controller.rb             | 6 +++---
 app/models/channel/email_parser.rb                | 2 +-
 app/models/observer/ticket/close_time.rb          | 2 +-
 app/models/observer/ticket/user_ticket_counter.rb | 4 ++--
 app/models/ticket.rb                              | 3 ++-
 db/migrate/20130101230004_change_ticket_state.rb  | 8 ++++++++
 6 files changed, 17 insertions(+), 8 deletions(-)
 create mode 100644 db/migrate/20130101230004_change_ticket_state.rb

diff --git a/app/controllers/tickets_controller.rb b/app/controllers/tickets_controller.rb
index 4b2207639..eb61af342 100644
--- a/app/controllers/tickets_controller.rb
+++ b/app/controllers/tickets_controller.rb
@@ -116,10 +116,10 @@ class TicketsController < ApplicationController
 
     # get closed/open states
     ticket_state_list_open   = Ticket::State.where(
-      :ticket_state_type_id => Ticket::StateType.where( :name => ['new','open', 'pending reminder', 'pending action'] )
+      :state_type_id => Ticket::StateType.where( :name => ['new','open', 'pending reminder', 'pending action'] )
     )
     ticket_state_list_closed = Ticket::State.where(
-      :ticket_state_type_id => Ticket::StateType.where( :name => ['closed'] )
+      :state_type_id => Ticket::StateType.where( :name => ['closed'] )
     )
 
     # get tickets
@@ -213,7 +213,7 @@ class TicketsController < ApplicationController
 
     # get closed/open states
     ticket_states   = Ticket::State.where(
-      :ticket_state_type_id => Ticket::StateType.where( :name => ['new','open', 'pending reminder', 'pending action', 'closed'] )
+      :state_type_id => Ticket::StateType.where( :name => ['new','open', 'pending reminder', 'pending action', 'closed'] )
     )
     ticket = Ticket.find( params[:ticket_id] )
     ticket_list = Ticket.where( :customer_id => ticket.customer_id, :ticket_state_id => ticket_states )
diff --git a/app/models/channel/email_parser.rb b/app/models/channel/email_parser.rb
index 016fa411d..59aeb0f4d 100644
--- a/app/models/channel/email_parser.rb
+++ b/app/models/channel/email_parser.rb
@@ -289,7 +289,7 @@ class Channel::EmailParser
       # set ticket state to open if not new
       if ticket
         ticket_state      = Ticket::State.find( ticket.ticket_state_id )
-        ticket_state_type = Ticket::StateType.find( ticket_state.ticket_state_type_id )
+        ticket_state_type = Ticket::StateType.find( ticket_state.state_type_id )
 
         # if tickte is merged, find linked ticket
         if ticket_state_type.name == 'merged'
diff --git a/app/models/observer/ticket/close_time.rb b/app/models/observer/ticket/close_time.rb
index 2fbac2027..3938dbbcb 100644
--- a/app/models/observer/ticket/close_time.rb
+++ b/app/models/observer/ticket/close_time.rb
@@ -21,7 +21,7 @@ class Observer::Ticket::CloseTime < ActiveRecord::Observer
 
       # check if ticket is closed now
       ticket_state = Ticket::State.lookup( :id => record.ticket_state_id )
-      ticket_state_type = Ticket::StateType.lookup( :id => ticket_state.ticket_state_type_id )
+      ticket_state_type = Ticket::StateType.lookup( :id => ticket_state.state_type_id )
       return true if ticket_state_type.name != 'closed'
 
       # set close_time
diff --git a/app/models/observer/ticket/user_ticket_counter.rb b/app/models/observer/ticket/user_ticket_counter.rb
index 8ecb81adc..10240e6c9 100644
--- a/app/models/observer/ticket/user_ticket_counter.rb
+++ b/app/models/observer/ticket/user_ticket_counter.rb
@@ -11,8 +11,8 @@ class Observer::Ticket::UserTicketCounter < ActiveRecord::Observer
   def user_ticket_counter_update(record)
     return if !record.customer_id
 
-    ticket_state_list_open   = Ticket::State.where( :ticket_state_type_id => Ticket::StateType.where(:name => ['new','open', 'pending reminder', 'pending action']) )
-    ticket_state_list_closed = Ticket::State.where( :ticket_state_type_id => Ticket::StateType.where(:name => ['closed'] ) )
+    ticket_state_list_open   = Ticket::State.where( :state_type_id => Ticket::StateType.where( :name => ['new','open', 'pending reminder', 'pending action']) )
+    ticket_state_list_closed = Ticket::State.where( :state_type_id => Ticket::StateType.where( :name => ['closed'] ) )
 
     tickets_open   = Ticket.where( :customer_id => record.customer_id, :ticket_state_id => ticket_state_list_open ).count()
     tickets_closed = Ticket.where( :customer_id => record.customer_id, :ticket_state_id => ticket_state_list_closed ).count()
diff --git a/app/models/ticket.rb b/app/models/ticket.rb
index df75a43b9..ddcf966f0 100644
--- a/app/models/ticket.rb
+++ b/app/models/ticket.rb
@@ -418,11 +418,12 @@ class Ticket < ApplicationModel
   end
 
   class StateType < ApplicationModel
+    has_many      :states,            :class_name => 'Ticket::State'
     validates     :name, :presence => true
   end
 
   class State < ApplicationModel
-    belongs_to    :ticket_state_type, :class_name => 'Ticket::StateType'
+    belongs_to    :state_type,        :class_name => 'Ticket::StateType'
     validates     :name, :presence => true
   end
 end
\ No newline at end of file
diff --git a/db/migrate/20130101230004_change_ticket_state.rb b/db/migrate/20130101230004_change_ticket_state.rb
new file mode 100644
index 000000000..295746d5e
--- /dev/null
+++ b/db/migrate/20130101230004_change_ticket_state.rb
@@ -0,0 +1,8 @@
+class ChangeTicketState < ActiveRecord::Migration
+  def up
+    rename_column :ticket_states, :ticket_state_type_id, :state_type_id
+  end
+
+  def down
+  end
+end