SONAR-2443 Fix could not unassign a review

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/controllers/reviews_controller.rb b/sonar-server/src/main/webapp/WEB-INF/app/controllers/reviews_controller.rb
index 5062feb382d2ad3dd01ece0af9254cad30c83034..01dec9ea605b50c4259594c9fbd5ba740549233c 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/controllers/reviews_controller.rb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/controllers/reviews_controller.rb
@@ -72,7 +72,8 @@ class ReviewsController < ApplicationController
       return
     end
 
-    @review.assignee = User.find params[:assignee_id]
+    assignee = User.find params[:assignee_id] unless params[:assignee_id].blank?
+    @review.assignee = assignee
     @review.save
 
     render :partial => 'reviews/view'
@@ -175,7 +176,8 @@ class ReviewsController < ApplicationController
     sanitize_violation(violation)
 
     violation.build_review(:user_id => current_user.id)
-    violation.review.assignee = User.find params[:assignee_id]
+    assignee = User.find params[:assignee_id] unless params[:assignee_id].blank?
+    violation.review.assignee = assignee
     violation.review.save!
     violation.save
 

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/reviews/_assign_form.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/reviews/_assign_form.html.erb
index cd10d6b3691849024e3a6feb151d360c4a8139cf..fa3cb27f1ec128f6a0f258477186934b19131500 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/reviews/_assign_form.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/reviews/_assign_form.html.erb
@@ -5,8 +5,7 @@
     
   <%= submit_to_remote "submit_btn", "Assign", 
          :url => { :action => 'assign' },
-         :update => "review",
-         :condition => "$('assignee_id').value != ''" -%>
+         :update => "review" -%>
   &nbsp;&nbsp;
   <%= link_to_remote 'Cancel', 
          :url => { :action => 'show', :id => params[:review_id] },

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/reviews/_review.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/reviews/_review.html.erb
index dd702ee4158cfa53ffa06df8184016aea55f3f42..2865a58609060230567aa9b69155bdf8331c313c 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/reviews/_review.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/reviews/_review.html.erb
@@ -96,7 +96,7 @@
           <td class="val" colspan="3">
                <%= qualifier_icon(@review.resource) -%> 
                <% if !review.on_project? %> <%= @review.project.long_name -%> <%= image_tag 'sep12.png' -%> <% end %>
-               <%= link_to_resource(review.resource, review.resource.long_name, { :tab => :violations, :rule => "f-positive" } ) %>
+               <%= link_to_resource(review.resource, review.resource.long_name, { :tab => :violations, :rule => review.false_positive ? "f-positive" : "" } ) %>
           </td>
         </tr>
   </table>

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 039f66976c99ebda66374ed8cc85823ec8ad7d58..68a98653424ecbdc58f90d2335da7ff1a98d662e 100644 (file)
--- 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
@@ -7,8 +7,7 @@
     
   <%= submit_to_remote "submit_btn", "Assign", 
          :url => { :action => 'violation_assign' },
-         :update => "vId" + params[:violation_id],
-         :condition => "$('assignee_id').value != ''" -%>
+         :update => "vId" + params[:violation_id] -%>
   &nbsp;&nbsp;
   <%= link_to_remote 'Cancel', 
          :url => { :action => 'display_violation', :id => params[:violation_id] },