Merge remote-tracking branch 'origin/develop'

Conflicts:
	app/assets/javascripts/srp
	test/nagios/soledad_sync.py
	test/nagios/webapp_login.py

1 files changed, 13 insertions, 0 deletions

diff --git a/engines/support/app/models/account_extension/tickets.rb b/engines/support/app/models/account_extension/tickets.rb
new file mode 100644
index 0000000..f898b56
--- /dev/null
+++ b/engines/support/app/models/account_extension/tickets.rb
@@ -0,0 +1,13 @@
+module AccountExtension::Tickets
+  extend ActiveSupport::Concern
+
+  def destroy_with_tickets
+    Ticket.destroy_all_from(self.user)
+    destroy_without_tickets
+  end
+
+  included do
+    alias_method_chain :destroy, :tickets
+  end
+
+end