Fixed rails 'reload' + 'include'/'extend' + 'require' issue with using 'load' instead.
This commit is contained in:
parent
8accda251e
commit
7311868404
5 changed files with 10 additions and 10 deletions
|
@ -1,7 +1,7 @@
|
|||
# Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/
|
||||
|
||||
class History < ApplicationModel
|
||||
require 'history/assets'
|
||||
load 'history/assets.rb'
|
||||
include History::Assets
|
||||
|
||||
self.table_name = 'histories'
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
# Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/
|
||||
|
||||
class Organization < ApplicationModel
|
||||
require 'organization/assets'
|
||||
load 'organization/assets.rb'
|
||||
include Organization::Assets
|
||||
extend Organization::Search
|
||||
include Organization::SearchIndex
|
||||
|
|
|
@ -4,13 +4,13 @@ class Ticket < ApplicationModel
|
|||
include Ticket::Escalation
|
||||
include Ticket::Subject
|
||||
include Ticket::Permission
|
||||
require 'ticket/assets'
|
||||
load 'ticket/assets.rb'
|
||||
include Ticket::Assets
|
||||
require 'ticket/history_log'
|
||||
load 'ticket/history_log.rb'
|
||||
include Ticket::HistoryLog
|
||||
require 'ticket/activity_stream_log'
|
||||
load 'ticket/activity_stream_log.rb'
|
||||
include Ticket::ActivityStreamLog
|
||||
require 'ticket/search_index'
|
||||
load 'ticket/search_index.rb'
|
||||
include Ticket::SearchIndex
|
||||
extend Ticket::Search
|
||||
|
||||
|
|
|
@ -1,11 +1,11 @@
|
|||
# Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/
|
||||
|
||||
class Ticket::Article < ApplicationModel
|
||||
require 'ticket/article/assets'
|
||||
load 'ticket/article/assets.rb'
|
||||
include Ticket::Article::Assets
|
||||
require 'ticket/article/history_log'
|
||||
load 'ticket/article/history_log.rb'
|
||||
include Ticket::Article::HistoryLog
|
||||
require 'ticket/article/activity_stream_log'
|
||||
load 'ticket/article/activity_stream_log.rb'
|
||||
include Ticket::Article::ActivityStreamLog
|
||||
|
||||
belongs_to :ticket
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
require 'digest/md5'
|
||||
|
||||
class User < ApplicationModel
|
||||
require 'user/assets'
|
||||
load 'user/assets.rb'
|
||||
include User::Assets
|
||||
extend User::Search
|
||||
include User::SearchIndex
|
||||
|
|
Loading…
Reference in a new issue