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

2015-04-28 01:19:26 +02:00 · 2015-04-28 01:19:26 +02:00 · ba1d7abf91
commit ba1d7abf91
parent 95e27b0994
22 changed files with 1119 additions and 1173 deletions
--- a/app/models/ticket/activity_stream_log.rb
+++ b/app/models/ticket/activity_stream_log.rb
@ -1,7 +1,6 @@
 # Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/
-
-class Ticket
-  module ActivityStreamLog
+# rubocop:disable ClassAndModuleChildren
+module Ticket::ActivityStreamLog

 =begin

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

 =begin

@ -39,5 +37,3 @@ returns
    )
  end
 end
-  end
-end
--- a/app/models/ticket/article/assets.rb
+++ b/app/models/ticket/article/assets.rb
@ -1,8 +1,6 @@
 # Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/

-class Ticket
-  class Article
-    module Assets
+module Ticket::Article::Assets

 =begin

@ -53,5 +51,3 @@ returns
    data
  end
 end
-  end
-end
--- a/app/models/ticket/article/history_log.rb
+++ b/app/models/ticket/article/history_log.rb
@ -1,8 +1,6 @@
 # Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/

-class Ticket
-  class Article
-    module HistoryLog
+module Ticket::Article::HistoryLog

 =begin

@ -30,5 +28,3 @@ returns
    History.add(data)
  end
 end
-  end
-end
--- a/app/models/ticket/assets.rb
+++ b/app/models/ticket/assets.rb
@ -1,7 +1,6 @@
 # Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/
-
-class Ticket
-  module Assets
+# rubocop:disable ClassAndModuleChildren
+module Ticket::Assets

 =begin

@ -40,4 +39,3 @@ returns
    data
  end
 end
-end
--- a/app/models/ticket/counter.rb
+++ b/app/models/ticket/counter.rb
@ -1,6 +1,4 @@
 # Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/
-
-class Ticket
-  class Counter < ApplicationModel
-  end
+# rubocop:disable ClassAndModuleChildren
+class Ticket::Counter < ApplicationModel
 end
--- a/app/models/ticket/escalation.rb
+++ b/app/models/ticket/escalation.rb
@ -1,7 +1,6 @@
 # Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/
-
-class Ticket
-  module Escalation
+# rubocop:disable ClassAndModuleChildren
+module Ticket::Escalation

 =begin

@ -322,4 +321,3 @@ returns
    escalation_time
  end
 end
-end
--- a/app/models/ticket/flag.rb
+++ b/app/models/ticket/flag.rb
@ -1,6 +1,4 @@
 # Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/

-class Ticket
-  class Flag < ApplicationModel
-  end
+class Ticket::Flag < ApplicationModel
 end
--- a/app/models/ticket/history_log.rb
+++ b/app/models/ticket/history_log.rb
@ -1,7 +1,6 @@
 # Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/
-
-class Ticket
-  module HistoryLog
+# rubocop:disable ClassAndModuleChildren
+module Ticket::HistoryLog

 =begin

@ -79,4 +78,3 @@ returns
    }
  end
 end
-end
--- a/app/models/ticket/number.rb
+++ b/app/models/ticket/number.rb
@ -1,7 +1,6 @@
 # Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/

-class Ticket
-  class Number
+class Ticket::Number
  include ApplicationLib

 =begin
@ -57,4 +56,3 @@ returns
    adapter
  end
 end
-end
--- a/app/models/ticket/number/date.rb
+++ b/app/models/ticket/number/date.rb
@ -1,8 +1,6 @@
 # Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/
-
-class Ticket
-  class Number
-    module Date
+# rubocop:disable ClassAndModuleChildren
+module Ticket::Number::Date
  extend self

  def generate
@ -84,5 +82,3 @@ class Ticket
    ticket
  end
 end
-  end
-end
--- a/app/models/ticket/number/increment.rb
+++ b/app/models/ticket/number/increment.rb
@ -1,8 +1,6 @@
 # Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/

-class Ticket
-  class Number
-    module Increment
+module Ticket::Number::Increment
  extend self

  def generate
@ -87,5 +85,3 @@ class Ticket
    ticket
  end
 end
-  end
-end
--- a/app/models/ticket/overviews.rb
+++ b/app/models/ticket/overviews.rb
@ -1,7 +1,6 @@
 # Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/
-
-class Ticket
-  module Overviews
+# rubocop:disable ClassAndModuleChildren
+module Ticket::Overviews

 =begin

@ -250,4 +249,3 @@ returns
    bind
  end
 end
-end
--- a/app/models/ticket/permission.rb
+++ b/app/models/ticket/permission.rb
@ -1,7 +1,6 @@
 # Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/
-
-class Ticket
-  module Permission
+# rubocop:disable ClassAndModuleChildren
+module Ticket::Permission

 =begin

@ -45,4 +44,3 @@ returns
    false
  end
 end
-end
--- a/app/models/ticket/priority.rb
+++ b/app/models/ticket/priority.rb
@ -1,8 +1,6 @@
 # Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/
-
-class Ticket
-  class Priority < ApplicationModel
+# rubocop:disable ClassAndModuleChildren
+class Ticket::Priority < ApplicationModel
  self.table_name = 'ticket_priorities'
  validates     :name, presence: true
 end
-end
--- a/app/models/ticket/screen_options.rb
+++ b/app/models/ticket/screen_options.rb
@ -1,7 +1,6 @@
 # Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/
-
-class Ticket
-  module ScreenOptions
+# rubocop:disable ClassAndModuleChildren
+module Ticket::ScreenOptions

 =begin

@ -175,4 +174,3 @@ returns
    }
  end
 end
-end
--- a/app/models/ticket/search.rb
+++ b/app/models/ticket/search.rb
@ -1,7 +1,6 @@
 # Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/
-
-class Ticket
-  module Search
+# rubocop:disable ClassAndModuleChildren
+module Ticket::Search

 =begin

@ -144,4 +143,3 @@ returns
    tickets
  end
 end
-end
--- a/app/models/ticket/search_index.rb
+++ b/app/models/ticket/search_index.rb
@ -1,7 +1,6 @@
 # Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/
-
-class Ticket
-  module SearchIndex
+# rubocop:disable ClassAndModuleChildren
+module Ticket::SearchIndex

 =begin

@ -107,4 +106,3 @@ returns
    SearchIndexBackend.add(self.class.to_s, attributes)
  end
 end
-end
--- a/app/models/ticket/state.rb
+++ b/app/models/ticket/state.rb
@ -1,7 +1,6 @@
 # Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/
-
-class Ticket
-  class State < ApplicationModel
+# rubocop:disable ClassAndModuleChildren
+class Ticket::State < ApplicationModel
  belongs_to    :state_type,        class_name: 'Ticket::StateType'
  validates     :name, presence: true

@ -52,4 +51,3 @@ returns:
    false
  end
 end
-end
--- a/app/models/ticket/state_type.rb
+++ b/app/models/ticket/state_type.rb
@ -1,9 +1,7 @@
 # Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/
-
-class Ticket
-  class StateType < ApplicationModel
+# rubocop:disable ClassAndModuleChildren
+class Ticket::StateType < ApplicationModel
  has_many      :states,            class_name: 'Ticket::State'
  validates     :name, presence: true
  latest_change_support
 end
-end
--- a/app/models/ticket/subject.rb
+++ b/app/models/ticket/subject.rb
@ -1,7 +1,6 @@
 # Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/
-
-class Ticket
-  module Subject
+# rubocop:disable ClassAndModuleChildren
+module Ticket::Subject

 =begin

@ -77,4 +76,3 @@ returns
    subject
  end
 end
-end