summaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorAzul <azul@riseup.net>2016-07-05 09:27:35 +0200
committerAzul <azul@riseup.net>2016-07-05 09:27:35 +0200
commit8666b74ce75856421a87d25452aafaa9301de3fd (patch)
tree38f4f1b2d54c8c4ff6b1bc07616cadff1271de4b /engines
parent949e17c7c30c5b179ba6545782ae995178481f78 (diff)
parentbf77b0b1f53753ba239ef8c2668bc76603cd96e5 (diff)
Merge remote-tracking branch 'pr/225' into develop
Fix install issue and update the documentation During the rails 4 update db:migrate stopped working because the way couchrest loads all models broke. This includes a fix and also updates the install instructions. I tried to separate advanced topics in development from the others by marking the sections (advanced) in doc/DEVELOP.md
Diffstat (limited to 'engines')
-rw-r--r--engines/support/app/models/account_extension/tickets.rb13
-rw-r--r--engines/support/config/initializers/account_lifecycle.rb2
-rw-r--r--engines/support/lib/account_extension/tickets.rb15
3 files changed, 17 insertions, 13 deletions
diff --git a/engines/support/app/models/account_extension/tickets.rb b/engines/support/app/models/account_extension/tickets.rb
deleted file mode 100644
index f38d5fd..0000000
--- a/engines/support/app/models/account_extension/tickets.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-module AccountExtension::Tickets
- extend ActiveSupport::Concern
-
- def destroy_with_tickets(destroy_identities=false)
- Ticket.destroy_all_from(self.user)
- destroy_without_tickets(destroy_identities)
- end
-
- included do
- alias_method_chain :destroy, :tickets
- end
-
-end
diff --git a/engines/support/config/initializers/account_lifecycle.rb b/engines/support/config/initializers/account_lifecycle.rb
index d9f04c1..9060757 100644
--- a/engines/support/config/initializers/account_lifecycle.rb
+++ b/engines/support/config/initializers/account_lifecycle.rb
@@ -1,3 +1,5 @@
+require 'account_extension/tickets'
+
ActiveSupport.on_load(:account) do
include AccountExtension::Tickets
end
diff --git a/engines/support/lib/account_extension/tickets.rb b/engines/support/lib/account_extension/tickets.rb
new file mode 100644
index 0000000..63f4873
--- /dev/null
+++ b/engines/support/lib/account_extension/tickets.rb
@@ -0,0 +1,15 @@
+module AccountExtension
+ module Tickets
+ extend ActiveSupport::Concern
+
+ def destroy_with_tickets(destroy_identities=false)
+ Ticket.destroy_all_from(self.user)
+ destroy_without_tickets(destroy_identities)
+ end
+
+ included do
+ alias_method_chain :destroy, :tickets
+ end
+
+ end
+end