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

Fixed rails 'reload' + 'include'/'extend' + 'require' issue with using 'load' instead.

Browse source
This commit is contained in:
Thorsten Eckel 2014-10-17 14:15:54 +02:00
parent 8accda251e
commit 7311868404
5 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/models/history.rb
View file

@ -1,7 +1,7 @@
# Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/ # Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/
class History < ApplicationModel class History < ApplicationModel
require 'history/assets' load 'history/assets.rb'
include History::Assets include History::Assets
self.table_name = 'histories' self.table_name = 'histories'

2
app/models/organization.rb
View file

@ -1,7 +1,7 @@
# Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/ # Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/
class Organization < ApplicationModel class Organization < ApplicationModel
require 'organization/assets' load 'organization/assets.rb'
include Organization::Assets include Organization::Assets
extend Organization::Search extend Organization::Search
include Organization::SearchIndex include Organization::SearchIndex

8
app/models/ticket.rb
View file

@ -4,13 +4,13 @@ class Ticket < ApplicationModel
include Ticket::Escalation include Ticket::Escalation
include Ticket::Subject include Ticket::Subject
include Ticket::Permission include Ticket::Permission
require 'ticket/assets' load 'ticket/assets.rb'
include Ticket::Assets include Ticket::Assets
require 'ticket/history_log' load 'ticket/history_log.rb'
include Ticket::HistoryLog include Ticket::HistoryLog
require 'ticket/activity_stream_log' load 'ticket/activity_stream_log.rb'
include Ticket::ActivityStreamLog include Ticket::ActivityStreamLog
require 'ticket/search_index' load 'ticket/search_index.rb'
include Ticket::SearchIndex include Ticket::SearchIndex
extend Ticket::Search extend Ticket::Search

6
app/models/ticket/article.rb
View file

@ -1,11 +1,11 @@
# Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/ # Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/
class Ticket::Article < ApplicationModel class Ticket::Article < ApplicationModel
require 'ticket/article/assets' load 'ticket/article/assets.rb'
include Ticket::Article::Assets include Ticket::Article::Assets
require 'ticket/article/history_log' load 'ticket/article/history_log.rb'
include Ticket::Article::HistoryLog include Ticket::Article::HistoryLog
require 'ticket/article/activity_stream_log' load 'ticket/article/activity_stream_log.rb'
include Ticket::Article::ActivityStreamLog include Ticket::Article::ActivityStreamLog
belongs_to :ticket belongs_to :ticket

2
app/models/user.rb
View file

@ -3,7 +3,7 @@
require 'digest/md5' require 'digest/md5'
class User < ApplicationModel class User < ApplicationModel
require 'user/assets' load 'user/assets.rb'
include User::Assets include User::Assets
extend User::Search extend User::Search
include User::SearchIndex include User::SearchIndex