From f0d3e015c07b24b44524328ff34b7bbc6f4ee1a8 Mon Sep 17 00:00:00 2001
From: Stas Vilchik <vilchiks@gmail.com>
Date: Tue, 29 Jul 2014 17:35:17 +0200
Subject: [PATCH] SONAR-4951 Add the current user in the fields of the Issues
 search form

---
 server/sonar-web/src/main/js/issues/app.js            | 11 ++++++++---
 .../main/js/navigator/filters/ajax-select-filters.js  |  4 +++-
 .../webapp/WEB-INF/app/views/issues/search.html.erb   |  1 +
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/server/sonar-web/src/main/js/issues/app.js b/server/sonar-web/src/main/js/issues/app.js
index 31715516a2d..c94661b84c4 100644
--- a/server/sonar-web/src/main/js/issues/app.js
+++ b/server/sonar-web/src/main/js/issues/app.js
@@ -111,6 +111,13 @@ requirejs(
           });
         this.filters.add(projectFilter);
 
+        var assigneeChoices = {
+          '!assigned': window.SS.phrases.unassigned
+        };
+        if (window.SS.currentUser) {
+          assigneeChoices[window.SS.currentUser] = window.SS.currentUserName + ' (' + window.SS.currentUser + ')';
+        }
+
         this.filters.add([
           new BaseFilters.Filter({
             name: window.SS.phrases.severity,
@@ -162,9 +169,7 @@ requirejs(
             type: AjaxSelectFilters.AssigneeFilterView,
             enabled: true,
             optional: false,
-            choices: {
-              '!assigned': window.SS.phrases.unassigned
-            }
+            choices: assigneeChoices
           }),
 
           new BaseFilters.Filter({
diff --git a/server/sonar-web/src/main/js/navigator/filters/ajax-select-filters.js b/server/sonar-web/src/main/js/navigator/filters/ajax-select-filters.js
index d32cf80bdf6..4037f7172b9 100644
--- a/server/sonar-web/src/main/js/navigator/filters/ajax-select-filters.js
+++ b/server/sonar-web/src/main/js/navigator/filters/ajax-select-filters.js
@@ -141,7 +141,9 @@ define([
               that.options.filterView.choices.unshift(item);
             });
             _.each(that.model.get('choices'), function(v, k) {
-              that.options.filterView.choices.add(new Backbone.Model({ id: k, text: v }));
+              if (k[0] === '!') {
+                that.options.filterView.choices.add(new Backbone.Model({ id: k, text: v }));
+              }
             });
             that.updateLists();
             that.$el.removeClass('fetching');
diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/views/issues/search.html.erb b/server/sonar-web/src/main/webapp/WEB-INF/app/views/issues/search.html.erb
index c76a3a81826..fac32ece75d 100644
--- a/server/sonar-web/src/main/webapp/WEB-INF/app/views/issues/search.html.erb
+++ b/server/sonar-web/src/main/webapp/WEB-INF/app/views/issues/search.html.erb
@@ -27,6 +27,7 @@
 
   _.extend(window.SS, {
     currentUser: '<%= current_user.login if current_user -%>',
+    currentUserName: '<%= current_user.name if current_user -%>',
     severities: <%= RulesConfigurationController::RULE_PRIORITIES.to_json.html_safe -%>,
     statuses: <%= @options_for_statuses.to_json.html_safe -%>,
     resolutions: <%= @options_for_resolutions.to_json.html_safe -%>,
-- 
2.39.5