Refactoring of ticket displaying/editing.

3 files changed, 7 insertions, 23 deletions

diff --git a/help/app/views/tickets/_new_comment.html.haml b/help/app/views/tickets/_new_comment.html.haml
index a924dfd..b216311 100644
--- a/help/app/views/tickets/_new_comment.html.haml
+++ b/help/app/views/tickets/_new_comment.html.haml
@@ -1,3 +1,2 @@
-= #do we want this partial? not using it now
-= simple_fields_for :comment do |c|
+= f.simple_fields_for :comments, comment_object do |c|
   = c.input :body, :label => 'Comment', :as => :text
diff --git a/help/app/views/tickets/new.html.haml b/help/app/views/tickets/new.html.haml
index 537b97f..0ee47ff 100644
--- a/help/app/views/tickets/new.html.haml
+++ b/help/app/views/tickets/new.html.haml
@@ -1,16 +1,9 @@
 %h2=t :new_ticket
 = simple_form_for(@ticket, :html => {:novalidate => true})  do |f| #turn off html5 validations to test
-  = #@ticket.errors.messages
   = f.input :title
-  = #f.input :email #if there is no current_user
   = f.input :email if !current_user  #hmm--might authenticated users want to submit an alternate email?
-
-  = f.simple_fields_for :comments do |c|
-    = c.input :body, :label => 'Comment', :as => :text
-
-  = #render :partial => 'new_comment' #what we were using
+  = render :partial => 'new_comment', :locals => {:f => f, :comment_object => nil}
   = # regarding_user if not logged in
   = # email if not logged in
-  = #f.button :submit, :value => t(:submit), :class => 'btn-primary' 
   = f.button :submit
   = link_to t(:cancel), tickets_path, :class => :btn
diff --git a/help/app/views/tickets/show.html.haml b/help/app/views/tickets/show.html.haml
index f09f525..b9f2ce6 100644
--- a/help/app/views/tickets/show.html.haml
+++ b/help/app/views/tickets/show.html.haml
@@ -1,6 +1,6 @@
 %h2= @ticket.title
 
-%a#title.editable.editable-click{"data-name" => "title", "data-original-title" => "Enter username", "data-resource" => "post", "data-type" => "text", "data-url" => ticket_path(@ticket.id), "data-pk" => @ticket.id, :href => "#"} 
+%a#title.editable.editable-click{"data-name" => "title", "data-resource" => "post", "data-type" => "text", "data-url" => ticket_path(@ticket.id), "data-pk" => @ticket.id, :href => "#"} 
   = @ticket.title
 
 %p
@@ -17,26 +17,18 @@
   = "status:" 
   - if @ticket.is_open
     = 'open'
-    = #link_to 'close', ticket_path, :method => :put
-    = #button_to 'close', ticket_path, :method => :put
-    = button_to 'close', {:change_status => :close}, :method => :put
+    = button_to 'close', {:post => {:is_open => false}}, :method => :put
   - else 
     = 'closed'
-    = button_to 'open', {:change_status => :open}, :method => :put
+    = button_to 'open', {:post => {:is_open => true}}, :method => :put
 = render(:partial => "comment", :collection => @ticket.comments)
 = #render @ticket.comments should work if view is in /app/views/comments/_comment
 
 = simple_form_for(@ticket, :html => {:novalidate => true}) do |f| #turn off html5 validations to test
-  = f.simple_fields_for :comments, TicketComment.new do |c|
-    = c.input :body, :label => 'Comment', :as => :text
-  = #render :partial => 'new_comment'
-  = #f.label :is_open
-  = #f.select :is_open, [true, false] #remove
+  = render :partial => 'new_comment', :locals => {:f => f, :comment_object => TicketComment.new}
   = f.button :submit, @post_reply_str
   - if @ticket.is_open
     = f.button :submit, @reply_close_str
 = #link_to t(:destroy), ticket_path,  :confirm => 'are you sure?', :method => :delete, :class => :btn if admin? # for link_to to work with delete, need to figure out jquery interaction correctly. see  http://stackoverflow.com/questions/3774925/delete-link-sends-get-instead-of-delete-in-rails-3-view etc..
-= button_to 'destroy', ticket_path, :confirm => 'are you sure?', :method => :delete  if admin?
-= # TODO want to have button to close
-= # TODO if admin, have  button to delete
+= button_to 'destroy', ticket_path, :confirm => 'are you sure?', :method => :delete if admin?
 = link_to t(:cancel), tickets_path, :class => :btn