From e7fc710e6467ca4e1dfc7a5cbd6ae2231270ca01 Mon Sep 17 00:00:00 2001
From: Stas Vilchik <vilchiks@gmail.com>
Date: Thu, 30 Oct 2014 15:35:44 +0100
Subject: [PATCH] SONAR-5718 Update issues widget in order to support project
 UUID

---
 .../plugins/core/widgets/issues/my_unresolved_issues.html.erb | 2 +-
 .../widgets/issues/unresolved_issues_per_assignee.html.erb    | 2 +-
 .../core/widgets/issues/unresolved_issues_statuses.html.erb   | 2 +-
 .../sonar-web/src/main/hbs/issues/issues-workspace-header.hbs | 2 +-
 .../app/views/project/widgets/issues/_issues_list.html.erb    | 4 ++--
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/issues/my_unresolved_issues.html.erb b/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/issues/my_unresolved_issues.html.erb
index 79946993b70..977957d4dbe 100644
--- a/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/issues/my_unresolved_issues.html.erb
+++ b/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/issues/my_unresolved_issues.html.erb
@@ -2,7 +2,7 @@
    if current_user && (!@project || has_role?(:user, @project))
 
      search_options = {}
-     search_options['componentRoots'] = @project.key if @project
+     search_options['componentRootUuids'] = @project.uuid if @project
      search_options['resolved'] = 'false'
      search_options['assignees'] = current_user.login
      
diff --git a/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/issues/unresolved_issues_per_assignee.html.erb b/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/issues/unresolved_issues_per_assignee.html.erb
index fec0255334f..27c8e54c8bf 100644
--- a/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/issues/unresolved_issues_per_assignee.html.erb
+++ b/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/issues/unresolved_issues_per_assignee.html.erb
@@ -1,7 +1,7 @@
 <%
     options = {}
     options['resolved'] = 'false'
-    options['componentRoots'] = @project.key
+    options['componentRootUuids'] = @project.uuid
     if @dashboard_configuration.selected_period?
       options['createdAfter'] = Api::Utils.format_datetime(@dashboard_configuration.from_datetime)
       options['createdBefore'] = Api::Utils.format_datetime(DateTime.now)
diff --git a/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/issues/unresolved_issues_statuses.html.erb b/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/issues/unresolved_issues_statuses.html.erb
index 7b54a12bcb9..c62ee086c91 100644
--- a/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/issues/unresolved_issues_statuses.html.erb
+++ b/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/issues/unresolved_issues_statuses.html.erb
@@ -6,7 +6,7 @@
 
    issues_search_options = {}
    issues_search_options['resolved'] = 'false'
-   issues_search_options['componentRoots'] = @project.key
+   issues_search_options['componentRootUuids'] = @project.uuid
 %>
 <table width="100%">
   <tr>
diff --git a/server/sonar-web/src/main/hbs/issues/issues-workspace-header.hbs b/server/sonar-web/src/main/hbs/issues/issues-workspace-header.hbs
index e2c874348eb..e06ea8aa755 100644
--- a/server/sonar-web/src/main/hbs/issues/issues-workspace-header.hbs
+++ b/server/sonar-web/src/main/hbs/issues/issues-workspace-header.hbs
@@ -15,7 +15,7 @@
 {{#if state.total}}
   <span class="issues-header-item issues-header-nav">
     <a class="js-issues-prev icon-prev"></a>
-    <span class="current">{{sum state.selectedIndex 1}} / {{state.total}}</span>
+    <span class="current">{{sum state.selectedIndex 1}} / <span id="issues-total">{{state.total}}</span></span>
     <a class="js-issues-next icon-next"></a>
   </span>
 {{/if}}
diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/views/project/widgets/issues/_issues_list.html.erb b/server/sonar-web/src/main/webapp/WEB-INF/app/views/project/widgets/issues/_issues_list.html.erb
index b222358ab4a..64dc71cabc8 100644
--- a/server/sonar-web/src/main/webapp/WEB-INF/app/views/project/widgets/issues/_issues_list.html.erb
+++ b/server/sonar-web/src/main/webapp/WEB-INF/app/views/project/widgets/issues/_issues_list.html.erb
@@ -9,8 +9,8 @@
    if search_options['filter']
      results = Internal.issues.execute(search_options['filter'].to_i, search_options)
    else
-     search_options['sort'] = 'UPDATE_DATE'
-     search_options['asc'] = 'FALSE'
+     search_options['sort'] = 'FILE_LINE'
+     search_options['asc'] = 'false'
      results = Internal.issues.execute(search_options)
    end
    issues = results.issues()
-- 
2.39.5