1 files changed, 93 insertions, 12 deletions

diff --git a/help/app/controllers/tickets_controller.rb b/help/app/controllers/tickets_controller.rb
index 4c7415b..6011232 100644
--- a/help/app/controllers/tickets_controller.rb
+++ b/help/app/controllers/tickets_controller.rb
@@ -3,6 +3,8 @@ class TicketsController < ApplicationController
   respond_to :html #, :json
   #has_scope :open, :type => boolean
 
+  before_filter :set_strings
+
   def new
     @ticket = Ticket.new
     @ticket.comments.build
@@ -33,34 +35,113 @@ class TicketsController < ApplicationController
 
   def show
     @ticket = Ticket.find(params[:id])
+    if !@ticket
+      redirect_to tickets_path, :alert => "No such ticket"
+      return
+    end
+    authorize_ticket_access
     # @ticket.comments.build
     # build ticket comments?
   end
   
   def update
     @ticket = Ticket.find(params[:id])
-    @ticket.attributes = params[:ticket]
     
-    @ticket.comments.last.posted_by = (current_user ? current_user.id : nil) #protecting posted_by isn't working, so this should protect it.
-
-    if @ticket.save
-      flash[:notice] = 'Ticket was successfully updated.'
-      respond_with @ticket
-    else
-      #redirect_to [:show, @ticket] #
-      flash[:alert] = 'Ticket has not been changed'
-      redirect_to @ticket
-      #respond_with(@ticket) # why does this go to edit?? redirect???
+    if ticket_access?
+      if status = params[:change_status] #close or open button was pressed
+        @ticket.close if params[:change_status] == 'close'
+        @ticket.reopen if params[:change_status] == 'open'
+      else   
+        params[:ticket][:comments_attributes] = nil if params[:ticket][:comments_attributes].values.first[:body].blank? #unset comments hash if no new comment was typed
+        @ticket.attributes = params[:ticket] #this will call comments_attributes=       
+        # @ticket.is_open = false if params[:commit] == @reply_close_str #this overrides is_open selection
+        @ticket.close if params[:commit] == @reply_close_str #this overrides is_open selection
+        
+        # what if there is an update and no new comment? Confirm that there is a new comment to update posted_by:
+        @ticket.comments.last.posted_by = (current_user ? current_user.id : nil) if @ticket.comments_changed? #protecting posted_by isn't working, so this should protect it.
+      end
+      if @ticket.changed? and @ticket.save
+        flash[:notice] = 'Ticket was successfully updated.'
+        respond_with @ticket
+      else
+        #redirect_to [:show, @ticket] #
+        flash[:alert] = 'Ticket has not been changed'
+        redirect_to @ticket
+        #respond_with(@ticket) # why does this go to edit?? redirect???
+      end
     end
   end
 
   def index
     # @tickets = Ticket.by_title #not actually what we will want
-    respond_with(@tickets = Ticket.all) #we'll want only tickets that this user can access
+    #we'll want only tickets that this user can access
+    # @tickets = Ticket.by_is_open.key(params[:status])
+
+    #below is obviously too messy and not what we want, but wanted to get basic functionality there
+    if admin?
+      # todo: for admins, might want option to see tickets they have already posted to. want to use something like tickets_by_admin
+      if params[:status] == 'open'
+        @tickets = Ticket.by_is_open.key(true)
+      elsif params[:status] == 'closed'
+        @tickets = Ticket.by_is_open.key(false)
+      elsif params[:status] == 'open tickets I admin' #TODO: obviously temp hack
+        @tickets = tickets_by_admin(current_user.id)
+      elsif params[:status] == 'all tickets I admin' #TODO: obviously temp hack
+        @tickets = tickets_by_admin(current_user.id, false)
+      else
+        @tickets = Ticket.all
+      end
+    elsif logged_in?
+      #TODO---if, when logged in, user accessed unauthenticated ticket, then seems okay to list it in their list of tickets. Thus, include all tickets that the user has posted to, not just those that they created.
+      if params[:status] == 'open'
+        @tickets = Ticket.by_is_open_and_created_by.key([true, current_user.id]).all
+      elsif params[:status] == 'closed'
+        @tickets = Ticket.by_is_open_and_created_by.key([false, current_user.id]).all
+      else
+        @tickets = Ticket.by_created_by.key(current_user.id).all
+      end
+    else
+      access_denied
+      return
+    end      
+
+    respond_with(@tickets) 
+  end
+
+  def destroy
+    @ticket = Ticket.find(params[:id])
+    @ticket.destroy if admin?
+    redirect_to tickets_path
   end
 
   private
   
+  def ticket_access?
+    @ticket and (admin? or !@ticket.created_by or (current_user and current_user.id == @ticket.created_by)) 
+  end
+
+  def authorize_ticket_access
+    access_denied unless ticket_access?
+  end
+
+  def tickets_by_admin(id=current_user.id, just_open=true)
+    admin_tickets = []
+    tickets = Ticket.all
+    tickets.each do |ticket|
+      ticket.comments.each do |comment| 
+        if comment.posted_by == id and (!just_open or ticket.is_open)
+          admin_tickets << ticket
+          break
+        end 
+      end
+    end
+    admin_tickets
+  end
+
+  def set_strings
+    @post_reply_str = 'Post reply' #t :post_reply
+    @reply_close_str = 'Reply and close' #t :reply_and_close
+  end
   # not using now, as we are using comment_attributes= from the Ticket model
 =begin
   def add_comment