diff options
| author | Azul <azul@leap.se> | 2012-12-18 02:17:12 +0100 |
|---|---|---|
| committer | Azul <azul@leap.se> | 2012-12-18 02:17:12 +0100 |
| commit | e899e5c3f33acb3228fac295013d7cc8b6e4eb04 (patch) | |
| tree | 701aa5ce938f20dacc85040c8172c924e1fad523 /help/app/views | |
| parent | d56a009ce084bd14dbd5a876010961caca16da5c (diff) | |
| parent | e61cae8d2fc5d5818e56433a45056a539b621bd3 (diff) | |
Merge branch 'develop'
Diffstat (limited to 'help/app/views')
| -rw-r--r-- | help/app/views/tickets/_new_comment.html.haml | 2 | ||||
| -rw-r--r-- | help/app/views/tickets/new.html.haml | 2 | ||||
| -rw-r--r-- | help/app/views/tickets/show.html.haml | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/help/app/views/tickets/_new_comment.html.haml b/help/app/views/tickets/_new_comment.html.haml index b216311..5697854 100644 --- a/help/app/views/tickets/_new_comment.html.haml +++ b/help/app/views/tickets/_new_comment.html.haml @@ -1,2 +1,2 @@ -= f.simple_fields_for :comments, comment_object do |c| += f.simple_fields_for :comments, @comment 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 0ee47ff..ca036a5 100644 --- a/help/app/views/tickets/new.html.haml +++ b/help/app/views/tickets/new.html.haml @@ -2,7 +2,7 @@ = simple_form_for(@ticket, :html => {:novalidate => true}) do |f| #turn off html5 validations to test = f.input :title = f.input :email if !current_user #hmm--might authenticated users want to submit an alternate email? - = render :partial => 'new_comment', :locals => {:f => f, :comment_object => nil} + = render :partial => 'new_comment', :locals => {:f => f} = # regarding_user if not logged in = # email if not logged in = f.button :submit diff --git a/help/app/views/tickets/show.html.haml b/help/app/views/tickets/show.html.haml index b9f2ce6..a4f3b5f 100644 --- a/help/app/views/tickets/show.html.haml +++ b/help/app/views/tickets/show.html.haml @@ -25,7 +25,7 @@ = #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 - = render :partial => 'new_comment', :locals => {:f => f, :comment_object => TicketComment.new} + = render :partial => 'new_comment', :locals => {:f => f} = f.button :submit, @post_reply_str - if @ticket.is_open = f.button :submit, @reply_close_str |