summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorelijah <elijah@riseup.net>2013-07-11 14:43:21 -0700
committerelijah <elijah@riseup.net>2013-07-11 14:43:21 -0700
commit1f77c345783bf197be183b2e5025f875c0eac882 (patch)
tree2d5cee025a303689d1b6ae71797e5b2d147c5d21
parente1219611dacb59cd51652806fb4c1cc79ea44a7e (diff)
fix incorrect calling of tickets_path
-rw-r--r--app/views/layouts/_navigation.html.haml2
-rw-r--r--help/app/helpers/auto_tickets_path_helper.rb2
2 files changed, 3 insertions, 1 deletions
diff --git a/app/views/layouts/_navigation.html.haml b/app/views/layouts/_navigation.html.haml
index b42c1fe..2f79a22 100644
--- a/app/views/layouts/_navigation.html.haml
+++ b/app/views/layouts/_navigation.html.haml
@@ -2,5 +2,5 @@
= link_to_navigation t(:overview), user_overview_path(@user), :active => controller?(:overviews)
= link_to_navigation t(:account_settings), edit_user_path(@user), :active => controller?(:users)
= link_to_navigation t(:email_settings), edit_user_email_settings_path(@user), :active => controller?(:email_settings)
- = link_to_navigation t(:support_tickets), auto_tickets_path(@user), :active => controller?(:tickets)
+ = link_to_navigation t(:support_tickets), auto_tickets_path, :active => controller?(:tickets)
= link_to_navigation t(:logout), logout_path, :method => :delete
diff --git a/help/app/helpers/auto_tickets_path_helper.rb b/help/app/helpers/auto_tickets_path_helper.rb
index bb71260..93f3cb9 100644
--- a/help/app/helpers/auto_tickets_path_helper.rb
+++ b/help/app/helpers/auto_tickets_path_helper.rb
@@ -13,6 +13,7 @@ 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)
@@ -31,6 +32,7 @@ module AutoTicketsPathHelper
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)