diff options
| author | Simon Brandhof <simon.brandhof@gmail.com> | 2012-03-06 16:18:40 +0100 |
|---|---|---|
| committer | Simon Brandhof <simon.brandhof@gmail.com> | 2012-03-06 16:18:40 +0100 |
| commit | 8b595a47c93e534a3b00a7439dfc98005a82a9b0 (patch) | |
| tree | 497f88393c7052aaa66a2ce58e5cb3fa27630e62 | |
| parent | c1d7bdb92af87e4e8882c7126cad5c5872254ba2 (diff) | |
| download | sonarqube-8b595a47c93e534a3b00a7439dfc98005a82a9b0.tar.gz sonarqube-8b595a47c93e534a3b00a7439dfc98005a82a9b0.zip | |
The button 'assign to me' should accept a comment
| -rw-r--r-- | sonar-server/src/main/webapp/WEB-INF/app/views/resource/_violation.html.erb | 4 | ||||
| -rw-r--r-- | sonar-server/src/main/webapp/WEB-INF/app/views/reviews/_violation_assign_form.html.erb | 10 |
2 files changed, 6 insertions, 8 deletions
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/resource/_violation.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/resource/_violation.html.erb index 4598ce3bec5..df816fa995e 100644 --- a/sonar-server/src/main/webapp/WEB-INF/app/views/resource/_violation.html.erb +++ b/sonar-server/src/main/webapp/WEB-INF/app/views/resource/_violation.html.erb @@ -68,11 +68,11 @@ <% if is_last_comment && current_user %> <span class="actions" id="commentActions<%= violation.id -%>"> - <%= image_tag 'sep12.png' -%> - <% if current_user.id == review_comment.user_id %> + <%= image_tag 'sep12.png' -%> + <%= link_to_remote message('reviews.edit'), :url => {:controller => "reviews", :action => "violation_comment_form", :comment_id => review_comment.id, :id => violation.id}, :update => "lastComment" + violation.id.to_s, diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/reviews/_violation_assign_form.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/reviews/_violation_assign_form.html.erb index 15bbd704747..2609c659881 100644 --- a/sonar-server/src/main/webapp/WEB-INF/app/views/reviews/_violation_assign_form.html.erb +++ b/sonar-server/src/main/webapp/WEB-INF/app/views/reviews/_violation_assign_form.html.erb @@ -27,12 +27,10 @@ <%= image_tag 'sep12.png' -%> - <%= button_to_remote message('reviews.assign_to_me_submit'), - { - :url => {:action => 'violation_assign', :id => params[:id], :me => true}, - :update => "vId" + params[:id] - }, - :disabled => (@violation.review && @violation.review.assignee_id==current_user.id) -%> + <%= submit_to_remote "submit_me_btn", message('reviews.assign_to_me_submit'), + :url => {:action => 'violation_assign', :id => params[:id], :me => true}, + :update => "vId" + params[:id], + :html => {:disabled => (@violation.review && @violation.review.assignee_id==current_user.id)} -%> <%= link_to_function message('cancel'), "cancelViolationAction(#{params[:id]})" -%> <script> |