diff options
author | Azul <azul@leap.se> | 2013-01-18 07:44:57 +0100 |
---|---|---|
committer | Azul <azul@leap.se> | 2013-01-18 07:44:57 +0100 |
commit | 27730c7e665ed64e691fdf6dbeebc39c8bfbbc4b (patch) | |
tree | cd1df0a9a7d3f0a9812b512cfb93db0f79b0421f /help/app/views/tickets/_new_comment.html.haml | |
parent | 247a6f14db14543773beb1a1e96f2c335800eb82 (diff) | |
parent | 19d563e2e2db98ecc5143229f554df6a09bc457e (diff) |
Merge remote-tracking branch 'origin/master' into feature/fixed-email-address
Conflicts:
users/app/views/emails/_email.html.haml
Diffstat (limited to 'help/app/views/tickets/_new_comment.html.haml')
-rw-r--r-- | help/app/views/tickets/_new_comment.html.haml | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/help/app/views/tickets/_new_comment.html.haml b/help/app/views/tickets/_new_comment.html.haml index 31d134f..96388ea 100644 --- a/help/app/views/tickets/_new_comment.html.haml +++ b/help/app/views/tickets/_new_comment.html.haml @@ -1,2 +1,4 @@ = f.simple_fields_for :comments, @comment do |c| = c.input :body, :label => 'Comment', :as => :text, :input_html => {:class => "span9", :rows=>4} + - if admin? + = c.input :private, :as => :boolean, :label => false, :inline_label => true |