From: Teryk Bellahsene <teryk.bellahsene@sonarsource.com>
Date: Tue, 20 Dec 2016 13:37:41 +0000 (+0100)
Subject: SONAR-8552 WS api/navigation/global returns the id instead of the url
X-Git-Tag: 6.3-RC1~701
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=3562bfaedd27cf0f4a8953b8a0405426e001a4f6;p=sonarqube.git

SONAR-8552 WS api/navigation/global returns the id instead of the url
---

diff --git a/server/sonar-server/src/main/java/org/sonar/server/ui/ws/GlobalNavigationAction.java b/server/sonar-server/src/main/java/org/sonar/server/ui/ws/GlobalNavigationAction.java
index 2340b2f1e45..8cb8817e2b8 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/ui/ws/GlobalNavigationAction.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/ui/ws/GlobalNavigationAction.java
@@ -98,8 +98,8 @@ public class GlobalNavigationAction implements NavigationWsAction {
     for (ViewProxy<Page> page : views.getPages(NavigationSection.HOME)) {
       if (page.isUserAuthorized()) {
         json.beginObject()
+          .prop("id", page.getId())
           .prop("name", page.getTitle())
-          .prop("url", page.isController() ? page.getId() : String.format("/plugins/home/%s", page.getId()))
           .endObject();
       }
     }
diff --git a/server/sonar-server/src/main/resources/org/sonar/server/ui/ws/example-global.json b/server/sonar-server/src/main/resources/org/sonar/server/ui/ws/example-global.json
index 311f46af032..79d5a430404 100644
--- a/server/sonar-server/src/main/resources/org/sonar/server/ui/ws/example-global.json
+++ b/server/sonar-server/src/main/resources/org/sonar/server/ui/ws/example-global.json
@@ -1,12 +1,12 @@
 {
   "globalPages": [
     {
-      "name": "My Plugin Page",
-      "url": "/plugins/home/my_plugin_page"
+      "id": "my_plugin_page",
+      "name": "My Plugin Page"
     },
     {
-      "name": "My Rails App",
-      "url": "/my_rails_app"
+      "id": "my_rails_app",
+      "name": "My Rails App"
     }
   ],
   "settings": {
diff --git a/server/sonar-server/src/test/java/org/sonar/server/ui/ws/GlobalNavigationActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/ui/ws/GlobalNavigationActionTest.java
index 58db73feb9e..4613abbff99 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/ui/ws/GlobalNavigationActionTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/ui/ws/GlobalNavigationActionTest.java
@@ -208,7 +208,7 @@ public class GlobalNavigationActionTest {
 
       @Override
       public String getId() {
-        return "/my_rails_app";
+        return "my_rails_app";
       }
     };
 
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/ui/ws/GlobalNavigationActionTest/global_pages_for_admin.json b/server/sonar-server/src/test/resources/org/sonar/server/ui/ws/GlobalNavigationActionTest/global_pages_for_admin.json
index 019342bd220..664b1269852 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/ui/ws/GlobalNavigationActionTest/global_pages_for_admin.json
+++ b/server/sonar-server/src/test/resources/org/sonar/server/ui/ws/GlobalNavigationActionTest/global_pages_for_admin.json
@@ -1,16 +1,16 @@
 {
   "globalPages": [
     {
-      "name": "My Plugin Page",
-      "url": "/plugins/home/my_plugin_page"
+      "id": "my_plugin_page",
+      "name": "My Plugin Page"
     },
     {
-      "name": "My Rails App",
-      "url": "/my_rails_app"
+      "id": "my_rails_app",
+      "name": "My Rails App"
     },
     {
-      "name": "Admin Page",
-      "url": "/plugins/home/admin_page"
+      "id": "admin_page",
+      "name": "Admin Page"
     }
   ]
 }
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/ui/ws/GlobalNavigationActionTest/global_pages_for_anonymous.json b/server/sonar-server/src/test/resources/org/sonar/server/ui/ws/GlobalNavigationActionTest/global_pages_for_anonymous.json
index b2783b5e528..ab7722b818d 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/ui/ws/GlobalNavigationActionTest/global_pages_for_anonymous.json
+++ b/server/sonar-server/src/test/resources/org/sonar/server/ui/ws/GlobalNavigationActionTest/global_pages_for_anonymous.json
@@ -1,12 +1,12 @@
 {
   "globalPages": [
     {
-      "name": "My Plugin Page",
-      "url": "/plugins/home/my_plugin_page"
+      "id": "my_plugin_page",
+      "name": "My Plugin Page"
     },
     {
-      "name": "My Rails App",
-      "url": "/my_rails_app"
+      "id": "my_rails_app",
+      "name": "My Rails App"
     }
   ]
 }
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/ui/ws/GlobalNavigationActionTest/global_pages_for_user.json b/server/sonar-server/src/test/resources/org/sonar/server/ui/ws/GlobalNavigationActionTest/global_pages_for_user.json
index b2783b5e528..ab7722b818d 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/ui/ws/GlobalNavigationActionTest/global_pages_for_user.json
+++ b/server/sonar-server/src/test/resources/org/sonar/server/ui/ws/GlobalNavigationActionTest/global_pages_for_user.json
@@ -1,12 +1,12 @@
 {
   "globalPages": [
     {
-      "name": "My Plugin Page",
-      "url": "/plugins/home/my_plugin_page"
+      "id": "my_plugin_page",
+      "name": "My Plugin Page"
     },
     {
-      "name": "My Rails App",
-      "url": "/my_rails_app"
+      "id": "my_rails_app",
+      "name": "My Rails App"
     }
   ]
 }