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

Moved back to compact module/class definition to prevent "superclass mismatch for class Ticket (TypeError)".

Browse source
This commit is contained in:
Martin Edenhofer 2015-04-28 01:19:26 +02:00
parent 95e27b0994
commit ba1d7abf91
22 changed files with 1119 additions and 1173 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,7 +1,6 @@
# Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/ # Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/
# rubocop:disable ClassAndModuleChildren
class Ticket module Ticket::ActivityStreamLog
module ActivityStreamLog
=begin =begin
@ -37,4 +36,3 @@ returns
) )
end end
end end
end

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

@ -1,7 +1,6 @@
# Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/ # Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/
# rubocop:disable ClassAndModuleChildren
class Ticket class Ticket::Article < ApplicationModel
class Article < ApplicationModel
load 'ticket/article/assets.rb' load 'ticket/article/assets.rb'
include Ticket::Article::Assets include Ticket::Article::Assets
load 'ticket/article/history_log.rb' load 'ticket/article/history_log.rb'
@ -49,4 +48,3 @@ class Ticket
latest_change_support latest_change_support
end end
end end
end

8
app/models/ticket/article/activity_stream_log.rb
View file

@ -1,8 +1,6 @@
# Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/ # Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/
# rubocop:disable ClassAndModuleChildren
class Ticket module Ticket::Article::ActivityStreamLog
class Article
module ActivityStreamLog
=begin =begin
@ -39,5 +37,3 @@ returns
) )
end end
end end
end
end

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

@ -1,8 +1,6 @@
# Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/ # Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/
class Ticket module Ticket::Article::Assets
class Article
module Assets
=begin =begin
@ -53,5 +51,3 @@ returns
data data
end end
end end
end
end

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

@ -1,8 +1,6 @@
# Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/ # Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/
class Ticket module Ticket::Article::HistoryLog
class Article
module HistoryLog
=begin =begin
@ -30,5 +28,3 @@ returns
History.add(data) History.add(data)
end end
end end
end
end

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

@ -1,7 +1,6 @@
# Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/ # Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/
# rubocop:disable ClassAndModuleChildren
class Ticket module Ticket::Assets
module Assets
=begin =begin
@ -40,4 +39,3 @@ returns
data data
end end
end end
end

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

@ -1,6 +1,4 @@
# Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/ # Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/
# rubocop:disable ClassAndModuleChildren
class Ticket class Ticket::Counter < ApplicationModel
class Counter < ApplicationModel
end
end end

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

@ -1,7 +1,6 @@
# Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/ # Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/
# rubocop:disable ClassAndModuleChildren
class Ticket module Ticket::Escalation
module Escalation
=begin =begin
@ -322,4 +321,3 @@ returns
escalation_time escalation_time
end end
end end
end

4
app/models/ticket/flag.rb
View file

@ -1,6 +1,4 @@
# Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/ # Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/
class Ticket class Ticket::Flag < ApplicationModel
class Flag < ApplicationModel
end
end end

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

@ -1,7 +1,6 @@
# Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/ # Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/
# rubocop:disable ClassAndModuleChildren
class Ticket module Ticket::HistoryLog
module HistoryLog
=begin =begin
@ -79,4 +78,3 @@ returns
} }
end end
end end
end

4
app/models/ticket/number.rb
View file

@ -1,7 +1,6 @@
# Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/ # Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/
class Ticket class Ticket::Number
class Number
include ApplicationLib include ApplicationLib
=begin =begin
@ -57,4 +56,3 @@ returns
adapter adapter
end end
end end
end

8
app/models/ticket/number/date.rb
View file

@ -1,8 +1,6 @@
# Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/ # Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/
# rubocop:disable ClassAndModuleChildren
class Ticket module Ticket::Number::Date
class Number
module Date
extend self extend self
def generate def generate
@ -84,5 +82,3 @@ class Ticket
ticket ticket
end end
end end
end
end

6
app/models/ticket/number/increment.rb
View file

@ -1,8 +1,6 @@
# Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/ # Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/
class Ticket module Ticket::Number::Increment
class Number
module Increment
extend self extend self
def generate def generate
@ -87,5 +85,3 @@ class Ticket
ticket ticket
end end
end end
end
end

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

@ -1,7 +1,6 @@
# Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/ # Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/
# rubocop:disable ClassAndModuleChildren
class Ticket module Ticket::Overviews
module Overviews
=begin =begin
@ -250,4 +249,3 @@ returns
bind bind
end end
end end
end

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

@ -1,7 +1,6 @@
# Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/ # Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/
# rubocop:disable ClassAndModuleChildren
class Ticket module Ticket::Permission
module Permission
=begin =begin
@ -45,4 +44,3 @@ returns
false false
end end
end end
end

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

@ -1,8 +1,6 @@
# Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/ # Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/
# rubocop:disable ClassAndModuleChildren
class Ticket class Ticket::Priority < ApplicationModel
class Priority < ApplicationModel
self.table_name = 'ticket_priorities' self.table_name = 'ticket_priorities'
validates :name, presence: true validates :name, presence: true
end end
end

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

@ -1,7 +1,6 @@
# Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/ # Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/
# rubocop:disable ClassAndModuleChildren
class Ticket module Ticket::ScreenOptions
module ScreenOptions
=begin =begin
@ -175,4 +174,3 @@ returns
} }
end end
end end
end

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

@ -1,7 +1,6 @@
# Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/ # Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/
# rubocop:disable ClassAndModuleChildren
class Ticket module Ticket::Search
module Search
=begin =begin
@ -144,4 +143,3 @@ returns
tickets tickets
end end
end end
end

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

@ -1,7 +1,6 @@
# Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/ # Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/
# rubocop:disable ClassAndModuleChildren
class Ticket module Ticket::SearchIndex
module SearchIndex
=begin =begin
@ -107,4 +106,3 @@ returns
SearchIndexBackend.add(self.class.to_s, attributes) SearchIndexBackend.add(self.class.to_s, attributes)
end end
end end
end

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

@ -1,7 +1,6 @@
# Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/ # Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/
# rubocop:disable ClassAndModuleChildren
class Ticket class Ticket::State < ApplicationModel
class State < ApplicationModel
belongs_to :state_type, class_name: 'Ticket::StateType' belongs_to :state_type, class_name: 'Ticket::StateType'
validates :name, presence: true validates :name, presence: true
@ -52,4 +51,3 @@ returns:
false false
end end
end end
end

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

@ -1,9 +1,7 @@
# Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/ # Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/
# rubocop:disable ClassAndModuleChildren
class Ticket class Ticket::StateType < ApplicationModel
class StateType < ApplicationModel
has_many :states, class_name: 'Ticket::State' has_many :states, class_name: 'Ticket::State'
validates :name, presence: true validates :name, presence: true
latest_change_support latest_change_support
end end
end

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

@ -1,7 +1,6 @@
# Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/ # Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/
# rubocop:disable ClassAndModuleChildren
class Ticket module Ticket::Subject
module Subject
=begin =begin
@ -77,4 +76,3 @@ returns
subject subject
end end
end end
end