Renamed tickets.ticket_priority to tickets.priority, tickets.ticket_state to ticket.state, ticket_articles.ticket_article_sender to ticket_articles.sender and ticket_articles.ticket_article_type to ticket_articles.type.

app/controllers/tickets_controller.rb

@@ -145,8 +145,8 @@ class TicketsController < ApplicationController
 
     # open tickets by customer
     ticket_list = Ticket.where(
-      :customer_id     => ticket.customer_id,
-      :ticket_state_id => Ticket::State.by_category( 'open' )
+      :customer_id  => ticket.customer_id,
+      :state_id     => Ticket::State.by_category( 'open' )
     )
     .where( 'id != ?', [ ticket.id ] )
     .order('created_at DESC')

app/models/channel/email_parser.rb

@@ -364,16 +364,16 @@ 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.state_type_id )
+        state      = Ticket::State.find( ticket.state_id )
+        state_type = Ticket::StateType.find( state.state_type_id )
 
         # if tickte is merged, find linked ticket
-        if ticket_state_type.name == 'merged'
+        if state_type.name == 'merged'
 
         end
 
-        if ticket_state_type.name != 'new'
-          ticket.ticket_state = Ticket::State.where( :name => 'open' ).first
+        if state_type.name != 'new'
+          ticket.state = Ticket::State.where( :name => 'open' ).first
           ticket.save
         end
       end
@@ -386,8 +386,8 @@ class Channel::EmailParser
           :group_id           => channel[:group_id] || 1,
           :customer_id        => user.id,
           :title              => mail[:subject] || '',
-          :ticket_state_id    => Ticket::State.where( :name => 'new' ).first.id,
-          :ticket_priority_id => Ticket::Priority.where( :name => '2 normal' ).first.id,
+          :state_id    => Ticket::State.where( :name => 'new' ).first.id,
+          :priority_id => Ticket::Priority.where( :name => '2 normal' ).first.id,
         )
 
         set_attributes_by_x_headers( ticket, 'ticket', mail )
@@ -400,16 +400,16 @@ class Channel::EmailParser
 
       # set attributes
       article = Ticket::Article.new(
-        :ticket_id                => ticket.id,
-        :ticket_article_type_id   => Ticket::Article::Type.where( :name => 'email' ).first.id,
-        :ticket_article_sender_id => Ticket::Article::Sender.where( :name => 'Customer' ).first.id,
-        :body                     => mail[:body],
-        :from                     => mail[:from],
-        :to                       => mail[:to],
-        :cc                       => mail[:cc],
-        :subject                  => mail[:subject],
-        :message_id               => mail[:message_id],
-        :internal                 => false,
+        :ticket_id    => ticket.id,
+        :type_id      => Ticket::Article::Type.where( :name => 'email' ).first.id,
+        :sender_id    => Ticket::Article::Sender.where( :name => 'Customer' ).first.id,
+        :body         => mail[:body],
+        :from         => mail[:from],
+        :to           => mail[:to],
+        :cc           => mail[:cc],
+        :subject      => mail[:subject],
+        :message_id   => mail[:message_id],
+        :internal     => false,
       )
 
       # x-headers lookup

app/models/channel/twitter2.rb

@@ -195,8 +195,8 @@ class Channel::Twitter2
     if @article_type == 'twitter direct-message'
       ticket = Ticket.where( :customer_id => user.id ).first
       if ticket
-        ticket_state_type = Ticket::StateType.where( ticket.ticket_state.state_type_id )
-        if ticket_state_type.name == 'closed' || ticket_state_type.name == 'closed'
+        state_type = Ticket::StateType.where( ticket.state.state_type_id )
+        if state_type.name == 'closed' || state_type.name == 'closed'
           ticket = nil
         end
       end
@@ -218,11 +218,11 @@ class Channel::Twitter2
         priority_id = priority.id
       end
       ticket = Ticket.create(
-        :group_id           => group_id,
-        :customer_id        => user.id,
-        :title              => tweet.text[0,40],
-        :ticket_state_id    => state_id,
-        :ticket_priority_id => priority_id,
+        :group_id    => group_id,
+        :customer_id => user.id,
+        :title       => tweet.text[0,40],
+        :state_id    => state_id,
+        :priority_id => priority_id,
       )
     end
 
@@ -236,8 +236,8 @@ class Channel::Twitter2
     return article if article
 
     # set ticket state to open if not new
-    if ticket.ticket_state.name != 'new'
-      ticket.ticket_state = Ticket::State.where( :name => 'open' ).first
+    if ticket.state.name != 'new'
+      ticket.state = Ticket::State.where( :name => 'open' ).first
       ticket.save
     end
 
@@ -248,14 +248,14 @@ class Channel::Twitter2
     end
 
     article = Ticket::Article.create(
-      :ticket_id                => ticket.id,
-      :ticket_article_type_id   => Ticket::Article::Type.where( :name => @article_type ).first.id,
-      :ticket_article_sender_id => Ticket::Article::Sender.where( :name => 'Customer' ).first.id,
-      :body                     => tweet.text,
-      :from                     => sender.name,
-      :to                       => to,
-      :message_id               => tweet.id,
-      :internal                 => false,
+      :ticket_id  => ticket.id,
+      :type_id    => Ticket::Article::Type.where( :name => @article_type ).first.id,
+      :sender_id  => Ticket::Article::Sender.where( :name => 'Customer' ).first.id,
+      :body       => tweet.text,
+      :from       => sender.name,
+      :to         => to,
+      :message_id => tweet.id,
+      :internal   => false,
     )
 
   end

app/models/history.rb

@@ -21,7 +21,7 @@ add a new history entry for an object
   History.add(
     :history_type      => 'updated',
     :history_object    => 'Ticket',
-    :history_attribute => 'ticket_state',
+    :history_attribute => 'state',
     :o_id              => ticket.id,
     :id_to             => 3,
     :id_from           => 2,

app/models/network.rb

@@ -2,8 +2,8 @@
 
 class Network < ApplicationModel
   #  belongs_to :group
-  #  belongs_to :ticket_state, :class_name => 'Ticket::State'
-  #  belongs_to :ticket_priority, :class_name => 'Ticket::Priority'
+  #  belongs_to :state,    :class_name => 'Ticket::State'
+  #  belongs_to :priority, :class_name => 'Ticket::Priority'
 
   class Category < ApplicationModel
     self.table_name = 'network_categories'

app/models/observer/ticket/article/communicate_email.rb

@@ -9,12 +9,12 @@ class Observer::Ticket::Article::CommunicateEmail < ActiveRecord::Observer
     return if Setting.get('import_mode')
 
     # if sender is customer, do not communication
-    sender = Ticket::Article::Sender.lookup( :id => record.ticket_article_sender_id )
+    sender = Ticket::Article::Sender.lookup( :id => record.sender_id )
     return 1 if sender == nil
     return 1 if sender['name'] == 'Customer'
 
     # only apply on emails
-    type = Ticket::Article::Type.lookup( :id => record.ticket_article_type_id )
+    type = Ticket::Article::Type.lookup( :id => record.type_id )
     return if type['name'] != 'email'
 
     # send background job

app/models/observer/ticket/article/communicate_facebook.rb

@@ -9,12 +9,12 @@ class Observer::Ticket::Article::CommunicateFacebook < ActiveRecord::Observer
     return if Setting.get('import_mode')
 
     # if sender is customer, do not communication
-    sender = Ticket::Article::Sender.lookup( :id => record.ticket_article_sender_id )
+    sender = Ticket::Article::Sender.lookup( :id => record.sender_id )
     return 1 if sender == nil
     return 1 if sender['name'] == 'Customer'
 
     # only apply on emails
-    type = Ticket::Article::Type.lookup( :id => record.ticket_article_type_id )
+    type = Ticket::Article::Type.lookup( :id => record.type_id )
     return if type['name'] != 'facebook'
 
     a = Channel::Facebook.new

app/models/observer/ticket/article/communicate_twitter.rb

@@ -9,12 +9,12 @@ class Observer::Ticket::Article::CommunicateTwitter < ActiveRecord::Observer
     return if Setting.get('import_mode')
 
     # if sender is customer, do not communication
-    sender = Ticket::Article::Sender.lookup( :id => record.ticket_article_sender_id )
+    sender = Ticket::Article::Sender.lookup( :id => record.sender_id )
     return 1 if sender == nil
     return 1 if sender['name'] == 'Customer'
 
     # only apply on tweets
-    type = Ticket::Article::Type.lookup( :id => record.ticket_article_type_id )
+    type = Ticket::Article::Type.lookup( :id => record.type_id )
     return if type['name'] != 'twitter direct-message' && type['name'] != 'twitter status'
 
     a = Channel::Twitter2.new

app/models/observer/ticket/article/fillup_from_email.rb

@@ -9,12 +9,12 @@ class Observer::Ticket::Article::FillupFromEmail < ActiveRecord::Observer
     return if Setting.get('import_mode')
 
     # if sender is customer, do not change anything
-    sender = Ticket::Article::Sender.lookup( :id => record.ticket_article_sender_id )
+    sender = Ticket::Article::Sender.lookup( :id => record.sender_id )
     return if sender == nil
     return if sender['name'] == 'Customer'
 
     # set email attributes
-    type = Ticket::Article::Type.lookup( :id => record.ticket_article_type_id )
+    type = Ticket::Article::Type.lookup( :id => record.type_id )
     return if type['name'] != 'email'
 
     # set subject if empty

app/models/observer/ticket/article/fillup_from_general.rb

@@ -9,7 +9,7 @@ class Observer::Ticket::Article::FillupFromGeneral < ActiveRecord::Observer
     return if Setting.get('import_mode')
 
     # if sender is customer, do not change anything
-    sender = Ticket::Article::Sender.lookup( :id => record.ticket_article_sender_id )
+    sender = Ticket::Article::Sender.lookup( :id => record.sender_id )
     return if sender == nil
     return if sender['name'] == 'Customer'