Merge remote-tracking branch 'origin/develop'

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

1 files changed, 0 insertions, 53 deletions

diff --git a/help/app/helpers/auto_tickets_path_helper.rb b/help/app/helpers/auto_tickets_path_helper.rb
deleted file mode 100644
index 93f3cb9..0000000
--- a/help/app/helpers/auto_tickets_path_helper.rb
+++ /dev/null
@@ -1,53 +0,0 @@
-#
-# These "auto" forms of the normal ticket path route helpers allow us to do two things automatically:
-#
-# (1) include the user in the path if appropriate.
-# (2) retain the sort params, if appropriate.
-#
-# Tickets views with a user_id are limited to that user. For admins, they don't need a user_id for any ticket action.
-#
-# This is available both to the views and the tickets_controller.
-#
-module AutoTicketsPathHelper
-
-  protected
-
-  def auto_tickets_path(options={})
-    return unless options.class == Hash
-    options = ticket_view_options.merge options
-    if @user
-      user_tickets_path(@user, options)
-    else
-      tickets_path(options)
-    end
-  end
-
-  def auto_ticket_path(ticket, options={})
-    options = ticket_view_options.merge options
-    if @user
-      user_ticket_path(@user, ticket, options)
-    else
-      ticket_path(ticket, options)
-    end
-  end
-
-  def auto_new_ticket_path(options={})
-    return unless options.class == Hash
-    options = ticket_view_options.merge options
-    if @user
-      new_user_ticket_path(@user, options)
-    else
-      new_ticket_path(options)
-    end
-  end
-
-  private
-
-  def ticket_view_options
-    hsh = {}
-    hsh[:open_status] = params[:open_status] if params[:open_status] && !params[:open_status].empty?
-    hsh[:sort_order]  = params[:sort_order]  if params[:sort_order]  && !params[:sort_order].empty?
-    hsh
-  end
-
-end
\ No newline at end of file