Merge branch 'master' into moderation

[rails.git] / app / views / issues / _comments.html.erb

diff --git a/app/views/issues/_comments.html.erb b/app/views/issues/_comments.html.erb
index ee40c9d5a98e25421fd61960e234f06050413ac1..d49ae867099097a1ea1de761cb8eadb952458444 100644 (file)
--- a/app/views/issues/_comments.html.erb
+++ b/app/views/issues/_comments.html.erb
@@ -2,15 +2,10 @@
   <% comments.each do |comment| %>
     <div class="comment">
       <div style="float:left">
   <% comments.each do |comment| %>
     <div class="comment">
       <div style="float:left">

-        <%= link_to user_thumbnail(comment.user), :controller => :user,:action =>:view, :display_name => comment.user.display_name %>
+        <%= link_to user_thumbnail(comment.user), :controller => :user, :action =>:view, :display_name => comment.user.display_name %>

       </div>
       </div>

-      <b> <%= link_to comment.user.display_name, :controller => :user,:action =>:view, :display_name => comment.user.display_name %> </b> <br/>
+      <b> <%= link_to comment.user.display_name, :controller => :user, :action =>:view, :display_name => comment.user.display_name %> </b> <br/>

       <%= comment.body %>
       <%= comment.body %>

-
-      <% if comment.reassign %>
-      <br/>
-      <i><%= t('issues.show.comments.reassign') %></i>
-      <% end %>

     </div>
     <span class="deemphasize">
       On <%= l comment.created_at.to_datetime, :format => :friendly %>
     </div>
     <span class="deemphasize">
       On <%= l comment.created_at.to_datetime, :format => :friendly %>


@@ -20,9 +15,9 @@
 </div>
 <br/>
 <div class="comment">
 </div>
 <br/>
 <div class="comment">

-  <%= form_for :issue_comment, :url => { :action => 'comment', :id => @issue.id, :user_id => @user.id } do |f| %>
+  <%= form_for @new_comment, url: issue_comments_path(@issue) do |f| %>

   <%= richtext_area :issue_comment, :body, :cols => 10, :rows => 8, :required => true %>
   <%= richtext_area :issue_comment, :body, :cols => 10, :rows => 8, :required => true %>

-  <%= label_tag t('issues.show.comments.reassign_param') %> <%= check_box_tag :reassign, true %> 
+  <%= label_tag :reassign, t('issues.show.comments.reassign_param') %> <%= check_box_tag :reassign, true %>

   <br/>
   <br/>
   <%= submit_tag 'Submit' %>
   <br/>
   <br/>
   <%= submit_tag 'Submit' %>