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

Improved API, renamed methodes.

Browse source
This commit is contained in:
Martin Edenhofer 2013-06-04 14:52:56 +02:00
parent a8d8764ac3
commit d1700945d8
9 changed files with 39 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/tickets_controller.rb
View file

@ -147,7 +147,7 @@ class TicketsController < ApplicationController
return if !ticket_permission( ticket )
# get history of ticket
history = History.history_list( 'Ticket', params[:id], 'Ticket::Article' )
history = History.list( 'Ticket', params[:id], 'Ticket::Article' )
# get related users
users = {}

14
app/models/history.rb
View file

@ -10,7 +10,7 @@ class History < ApplicationModel
@@cache_object = {}
@@cache_attribute = {}
def self.history_create(data)
def self.add(data)
# lookups
if data[:history_type]
@ -61,13 +61,15 @@ class History < ApplicationModel
end
end
def self.history_destroy( requested_object, requested_object_id )
History.where( :history_object_id => History::Object.where( :name => requested_object ) ).
where( :o_id => requested_object_id ).
destroy_all
def self.remove( requested_object, requested_object_id )
history_object = History::Object.where( :name => requested_object ).first
History.where(
:history_object_id => history_object.id,
:o_id => requested_object_id,
).destroy_all
end
def self.history_list( requested_object, requested_object_id, related_history_object = nil )
def self.list( requested_object, requested_object_id, related_history_object = nil )
if !related_history_object
history_object = self.history_object_lookup( requested_object )
history = History.where( :history_object_id => history_object.id ).

4
app/models/observer/history.rb
View file

@ -19,7 +19,7 @@ class Observer::History < ActiveRecord::Observer
related_o_id = record.ticket_id
related_history_object = 'Ticket'
end
History.history_create(
History.add(
:o_id => record.id,
:history_type => 'created',
:history_object => record.class.name,
@ -143,7 +143,7 @@ class Observer::History < ActiveRecord::Observer
related_o_id = record.ticket_id
related_history_object_id = 'Ticket'
end
History.history_create(
History.add(
:o_id => current.id,
:history_type => 'updated',
:history_object => record.class.name,

6
app/models/observer/tag/ticket_history.rb
View file

@ -9,13 +9,12 @@ class Observer::Tag::TicketHistory < ActiveRecord::Observer
return true if record.tag_object.name != 'Ticket';
# add ticket history
History.history_create(
History.add(
:o_id => record.o_id,
:history_type => 'added',
:history_object => 'Ticket',
:history_attribute => 'Tag',
:value_from => record.tag_item.name,
:created_by_id => record.created_by_id || UserInfo.current_user_id || 1
)
end
def after_destroy(record)
@ -24,13 +23,12 @@ class Observer::Tag::TicketHistory < ActiveRecord::Observer
return true if record.tag_object.name != 'Ticket';
# add ticket history
History.history_create(
History.add(
:o_id => record.o_id,
:history_type => 'removed',
:history_object => 'Ticket',
:history_attribute => 'Tag',
:value_from => record.tag_item.name,
:created_by_id => record.created_by_id || UserInfo.current_user_id || 1
)
end
end

3
app/models/observer/ticket/article/communicate_email.rb
View file

@ -55,7 +55,7 @@ class Observer::Ticket::Article::CommunicateEmail < ActiveRecord::Observer
end
}
if recipient_list != ''
History.history_create(
History.add(
:o_id => record.id,
:history_type => 'email',
:history_object => 'Ticket::Article',
@ -63,7 +63,6 @@ class Observer::Ticket::Article::CommunicateEmail < ActiveRecord::Observer
:related_history_object => 'Ticket',
:value_from => record.subject,
:value_to => recipient_list,
:created_by_id => record.created_by_id,
)
end
end

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

@ -235,7 +235,7 @@ From: #{article.from}
# add history record
if recipient_list != ''
History.history_create(
History.add(
:o_id => ticket.id,
:history_type => 'notification',
:history_object => 'Ticket',

2
app/models/ticket.rb
View file

@ -695,7 +695,7 @@ class Ticket < ApplicationModel
def destroy_dependencies
# delete history
History.history_destroy( 'Ticket', self.id )
History.remove( 'Ticket', self.id )
# delete articles
self.articles.destroy_all

10
lib/import/otrs.rb
View file

@ -417,7 +417,7 @@ module Import::OTRS
# puts '-------'
# puts history.inspect
if history['HistoryType'] == 'NewTicket'
History.history_create(
History.add(
:id => history['HistoryID'],
:o_id => history['TicketID'],
:history_type => 'created',
@ -444,7 +444,7 @@ module Import::OTRS
end
end
# puts "STATE UPDATE (#{history['HistoryID']}): -> #{from}->#{to}"
History.history_create(
History.add(
:id => history['HistoryID'],
:o_id => history['TicketID'],
:history_type => 'updated',
@ -469,7 +469,7 @@ module Import::OTRS
to = $3
to_id = $4
end
History.history_create(
History.add(
:id => history['HistoryID'],
:o_id => history['TicketID'],
:history_type => 'updated',
@ -494,7 +494,7 @@ module Import::OTRS
to = $3
to_id = $4
end
History.history_create(
History.add(
:id => history['HistoryID'],
:o_id => history['TicketID'],
:history_type => 'updated',
@ -509,7 +509,7 @@ module Import::OTRS
)
end
if history['ArticleID'] && history['ArticleID'] != 0
History.history_create(
History.add(
:id => history['HistoryID'],
:o_id => history['ArticleID'],
:history_type => 'created',

2
test/unit/history_test.rb
View file

@ -162,7 +162,7 @@ class HistoryTest < ActiveSupport::TestCase
tickets.push ticket
# get history
history_list = History.history_list( 'Ticket', ticket.id, 'Ticket::Article' )
history_list = History.list( 'Ticket', ticket.id, 'Ticket::Article' )
puts history_list.inspect
test[:history_check].each { |check_item|
# puts '+++++++++++'