SONAR-2443 Use user login instead of id for the auto-suggest field

Completely remove the use of "assignee_id" as this can be
misleading in several places.

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 7307a3ae5829f3c7a3aa8c1a83d1f49c6ebd5b98..92103a568463213049e3eeea6c4bdd613af7e54f 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
@@ -238,7 +238,7 @@ class ReviewsController < ApplicationController
     sanitize_violation(violation)
 
     unless violation.review
-      assignee = User.find params[:assignee_id] unless params[:assignee_id].blank?
+      assignee = findUserByLogin(params[:assignee_login]) unless params[:assignee_login].blank?
       violation.create_review!(
           :assignee => assignee,
           :user => current_user)

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/helpers/users_helper.rb b/sonar-server/src/main/webapp/WEB-INF/app/helpers/users_helper.rb
index 1ba58ca4c8d7b6de4b5aae08f5a56df60360b314..695f922dbd263dd5155b2797f209b19c07ae23a2 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/helpers/users_helper.rb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/helpers/users_helper.rb
@@ -121,8 +121,8 @@ module UsersHelper
   # (for the moment 'class' is supported).
   #
   # Example:
-  #   <%= user_autocomplete_field "assignee_id", @assignee_id -%>
-  #   # => generates an input field for the parameter 'assignee_id'
+  #   <%= user_autocomplete_field "assignee_login", @assignee_login -%>
+  #   # => generates an input field for the parameter 'assignee_login'
   #
   def user_autocomplete_field(param_id, param_value, options={})
     param_id_name = param_id

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 15b621fec2248559af09198a84b2e992e96a08fe..e77da238aebc93201a3a4392f09fb2edc5cbc455 100644 (file)
--- 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
@@ -56,7 +56,7 @@
                        <%= link_to_remote (violation.review.assignee_id ? "Reassign" : "Assign"),  
                                        :url => { :controller => "reviews", :action => "violation_assign_form", :violation_id => violation.id},
                                        :update => "vActions" + violation.id.to_s,
-                                       :complete => "$('vActions" + violation.id.to_s + "').show();$('commentActions" + violation.id.to_s + "').hide();$('assignee_id').focus();" -%>
+                                       :complete => "$('vActions" + violation.id.to_s + "').show();$('commentActions" + violation.id.to_s + "').hide();$('assignee_login').focus();" -%>
                <%
                      end
             end 
@@ -70,7 +70,7 @@
         <% end %>
       
         &nbsp;
-        <% if violation.review && violation.review.can_change_false_positive_flag? %>
+        <% if (!violation.review) || (violation.review && violation.review.can_change_false_positive_flag?) %>
         <%= link_to_remote (violation.switched_off? ? "Unflag as false-positive" : "Flag as false-positive"),
                        :url => { :controller => "reviews", :action => "violation_false_positive_form", :id => violation.id, :false_positive => !violation.switched_off? },
                        :update => "reviewForm" + violation.id.to_s,

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 05c7e46353fcdc315ccbb8b3f8ec385701b97513..542a584c2961e496a40d62f94e3478cee262bac9 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
@@ -27,7 +27,7 @@
                <%= link_to_remote (review.assignee_id ? "Reassign" : "Assign"),  
                                :url => { :controller => "reviews", :action => "assign_form", :review_id => review.id},
                                :update => "assignForm",
-                               :complete => "$('rActions').hide(); $('editActions').hide(); $('assignee_id').focus();" -%>
+                               :complete => "$('rActions').hide(); $('editActions').hide(); $('assignee_login').focus();" -%>
              
                &nbsp;
           <% end %>

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/reviews/_violation_comment_form.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/reviews/_violation_comment_form.html.erb
index 9072af34d4a505f5682273f2777abde26c2ecad3..b5324ab753b11a5ee37b4f19cfb918a6fd8e7a33 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/reviews/_violation_comment_form.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/reviews/_violation_comment_form.html.erb
@@ -23,7 +23,7 @@
         <% if @violation.review.nil? || @violation.review.comments.size==0 %>
           &nbsp;&nbsp;
           <span>Assignee:</span>
-          <%= user_autocomplete_field "assignee_id", current_user.id -%>
+          <%= user_autocomplete_field "assignee_login", current_user.login -%>
         <% end %>
       </td>
       <td class="sep"></td>

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/reviews/index.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/reviews/index.html.erb
index 787e2a49636a7a007f4aec79c73222ca4f9b049d..74eca028c2bee8db61543653fecb7826278c00f6 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/reviews/index.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/reviews/index.html.erb
@@ -4,10 +4,10 @@ function reviewIdFieldModified(field) {
     $('statuses').value = ''
     $('severities').value = ''
     $('projects').value = ''
-    $('author_id').value = ''
-    $('autocompleteText-author_id').value = ''
-    $('assignee_id').value = ''
-    $('autocompleteText-assignee_id').value = ''  
+    $('author_login').value = ''
+    $('autocompleteText-author_login').value = ''
+    $('assignee_login').value = ''
+    $('autocompleteText-assignee_login').value = ''  
     $('false_positives').value = 'with'  
   }
 }
@@ -72,7 +72,7 @@ function launchSearch(columnName, link) {
           <%= user_autocomplete_field "assignee_login", @assignee_login, { :class => "max-width" } -%>
           <br/>
           <br/>
-          <select name="false_positives" id="false_positives" onchange="if(this.value=='only' || this.value=='with') {$('assignee_id').value = ''; $('autocompleteText-assignee_id').value = '';};">
+          <select name="false_positives" id="false_positives" onchange="if(this.value=='only' || this.value=='with') {$('assignee_login').value = ''; $('autocompleteText-assignee_login').value = ''; $('statuses').value = '';};">
             <option <%= 'selected' if @false_positives=='without' -%> value="without">Without false positives</option>
             <option <%= 'selected' if @false_positives=='only' -%> value="only">Only false positives</option>
           </select>