Sutty/trabajo-afectivo
5
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Renamed ticket_state.ticket_state_type_id to ticket_state.state_type_id.

Browse source
This commit is contained in:
Martin Edenhofer 2013-01-02 00:35:46 +01:00
parent 2d5bcf7f4a
commit 323e279ce5
6 changed files with 17 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/controllers/tickets_controller.rb
View file

@ -116,10 +116,10 @@ class TicketsController < ApplicationController
# get closed/open states # get closed/open states
ticket_state_list_open = Ticket::State.where( 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_list_closed = Ticket::State.where(
:ticket_state_type_id => Ticket::StateType.where( :name => ['closed'] ) :state_type_id => Ticket::StateType.where( :name => ['closed'] )
) )
# get tickets # get tickets
@ -213,7 +213,7 @@ class TicketsController < ApplicationController
# get closed/open states # get closed/open states
ticket_states = Ticket::State.where( 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 = Ticket.find( params[:ticket_id] )
ticket_list = Ticket.where( :customer_id => ticket.customer_id, :ticket_state_id => ticket_states ) ticket_list = Ticket.where( :customer_id => ticket.customer_id, :ticket_state_id => ticket_states )

2
app/models/channel/email_parser.rb
View file

@ -289,7 +289,7 @@ class Channel::EmailParser
# set ticket state to open if not new # set ticket state to open if not new
if ticket if ticket
ticket_state = Ticket::State.find( ticket.ticket_state_id ) 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 tickte is merged, find linked ticket
if ticket_state_type.name == 'merged' if ticket_state_type.name == 'merged'

2
app/models/observer/ticket/close_time.rb
View file

@ -21,7 +21,7 @@ class Observer::Ticket::CloseTime < ActiveRecord::Observer
# check if ticket is closed now # check if ticket is closed now
ticket_state = Ticket::State.lookup( :id => record.ticket_state_id ) 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' return true if ticket_state_type.name != 'closed'
# set close_time # set close_time

4
app/models/observer/ticket/user_ticket_counter.rb
View file

@ -11,8 +11,8 @@ class Observer::Ticket::UserTicketCounter < ActiveRecord::Observer
def user_ticket_counter_update(record) def user_ticket_counter_update(record)
return if !record.customer_id 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_open = Ticket::State.where( :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_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_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() tickets_closed = Ticket.where( :customer_id => record.customer_id, :ticket_state_id => ticket_state_list_closed ).count()

3
app/models/ticket.rb
View file

@ -418,11 +418,12 @@ class Ticket < ApplicationModel
end end
class StateType < ApplicationModel class StateType < ApplicationModel
has_many :states, :class_name => 'Ticket::State'
validates :name, :presence => true validates :name, :presence => true
end end
class State < ApplicationModel class State < ApplicationModel
belongs_to :ticket_state_type, :class_name => 'Ticket::StateType' belongs_to :state_type, :class_name => 'Ticket::StateType'
validates :name, :presence => true validates :name, :presence => true
end end
end end

8
db/migrate/20130101230004_change_ticket_state.rb Normal file
View file

@ -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