iPhone UI was showing all tickets for a client, now only shows non ar…

…chived
jonmagic · Dec 10, 2008 · e47a0a2 · e47a0a2
1 parent 2a7deed
commit e47a0a2
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/app/controllers/iphone/tickets_controller.rb b/app/controllers/iphone/tickets_controller.rb
@@ -11,7 +11,14 @@ def index
     if params[:client_id]
       @tickets = Ticket.find(:all, :conditions => {:client_id => params[:client_id]})
     elsif params[:device_id]
-      @tickets = Device.find(params[:device_id]).tickets
+      tickets = Device.find(params[:device_id]).tickets
+      new_array
+      tickets.each do |ticket|
+        if ticket.archived_on == nil
+          new_array << ticket
+        end
+      end
+      @tickets = new_array.sort_by{|ticket| [ticket.status, ticket.id]}
     else
       if params[:status]
         @tickets = Ticket.limit(params[:status], params[:scope], current_user, params[:device])

diff --git a/app/views/layouts/iphone.html.erb b/app/views/layouts/iphone.html.erb
@@ -19,7 +19,7 @@
       ul#ticketList > li > a > table {color:#999;}
       /* General Panel CSS */
       span.overflow {text-overflow: ellipsis;overflow: hidden;white-space: nowrap;width:175px;}
-      .panel > div.textbox {position: relative;margin: 0 0 5px 0;padding: 0 20px;background: #FFFFFF;-webkit-border-radius: 10px;-moz-border-radius: 10px;border: 1px solid #999999;text-align: left;font-size: 16px;}
+      .panel > div.textbox {position: relative;margin: 0 0 20px 0;padding: 0 20px;background: #FFFFFF;-webkit-border-radius: 10px;-moz-border-radius: 10px;border: 1px solid #999999;text-align: left;font-size: 16px;}
       .panel > div.textbox hr {}
       /* Ticket Panel CSS */
       div.ticket_entry {position:relative;border-bottom:1px solid #999;margin-top:20px;padding-top:50px;}