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.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.html.haml')
| -rw-r--r-- | help/app/views/tickets/new.html.haml | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/help/app/views/tickets/new.html.haml b/help/app/views/tickets/new.html.haml index ee7adb2..1aa689b 100644 --- a/help/app/views/tickets/new.html.haml +++ b/help/app/views/tickets/new.html.haml @@ -3,9 +3,8 @@ = simple_form_for @ticket, :validate => true, :html => {:class => 'form-horizontal'} do |f| = f.input :title = f.input :email if !current_user #hmm--might authenticated users want to submit an alternate email? + = f.input :regarding_user = render :partial => 'new_comment', :locals => {:f => f} - = # regarding_user if not logged in - = # email if not logged in .form-actions = f.button :submit, :class => 'btn-primary' = link_to t(:cancel), tickets_path, :class => :btn |