1 files changed, 45 insertions, 12 deletions
diff --git a/help/app/helpers/tickets_helper.rb b/help/app/helpers/tickets_helper.rb
index bd2c069..7af50d6 100644
--- a/help/app/helpers/tickets_helper.rb
+++ b/help/app/helpers/tickets_helper.rb
@@ -1,27 +1,54 @@
 module TicketsHelper
+  #
+  # FORM HELPERS
+  #
 
-  def status
-    params[:open_status] || 'open'
+  #
+  # hidden fields that should be added to ever ticket form.
+  # these are use for proper redirection after successful actions.
+  #
+  def hidden_ticket_fields
+    haml_concat hidden_field_tag('open_status', params[:open_status])
+    haml_concat hidden_field_tag('sort_order', params[:sort_order])
+    haml_concat hidden_field_tag('user_id', params[:user_id])
+    ""
   end
 
-  def admin
-    # do we not want this set for non-admins? the param will be viewable in the url
-    params[:admin_status] || 'all'
+  #
+  # PARAM HELPERS
+  #
+
+  def search_status
+    if action?(:index)
+      params[:open_status] || 'open'
+    else
+      nil
+    end
   end
 
-  def order
+  def search_order
     params[:sort_order] || 'updated_at_desc'
   end
 
+  #
+  # LINK HELPERS
+  #
+
   def link_to_status(new_status)
-    label = new_status + ' issues'
-    link_to label, :open_status => new_status, :admin_status => admin, :sort_order => order
+    if new_status == "open"
+      label = t(:open_tickets)
+    elsif new_status == "closed"
+      label = t(:closed_tickets)
+    elsif new_status == "all"
+      label = t(:all_tickets)
+    end
+    link_to label, auto_tickets_path(:open_status => new_status, :sort_order => search_order)
   end
 
   def link_to_order(order_field)
-    if order.start_with?(order_field)
+    if search_order.start_with?(order_field)
       # link for currently-filtered field. Link to other direction of this field.
-      if order.end_with? 'asc'
+      if search_order.end_with? 'asc'
         direction = 'desc'
         icon_direction = 'up'
       else
@@ -35,8 +62,14 @@ module TicketsHelper
       direction = 'desc'
     end
 
-    link_to :sort_order => order_field + '_at_' + direction, :open_status => status, :admin_status => admin do
-      arrow + order_field + ' at'
+    if order_field == 'updated'
+      label = t(:updated)
+    elsif order_field == 'created'
+      label = t(:created)
+    end
+
+    link_to auto_tickets_path(:sort_order => order_field + '_at_' + direction, :open_status => search_status) do
+      arrow + label
     end
   end