Merge "Closes-bug: #1646340 - Project dropdowns in breadcrumb are not…

… showing data as expected" into R3.2
Juniper · Dec 8, 2016 · 113aad5 · 113aad5
2 parents 46bf4c9 + bbbf57a
commit 113aad5
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/webroot/common/ui/js/controller.constants.js b/webroot/common/ui/js/controller.constants.js
@@ -12,8 +12,7 @@ define([
     var CTConstants = function () {
 
         this.URL_ALL_DOMAINS = '/api/tenants/config/domains';
-        this.URL_ALL_PROJECTS = '/api/tenants/config/all-projects';
-        this.URL_PROJECTS = '/api/tenants/config/projects';
+        this.URL_ALL_PROJECTS = '/api/tenants/config/projects';
         this.URL_ALL_PROJECTS_VCENTER_OR_CONFIG = '/api/tenants/projects';
 
         this.URL_PROJECT_CONNECTED_GRAPH = '/api/tenant/monitoring/project-connected-graph?fqName={0}';

diff --git a/webroot/common/ui/js/controller.utils.js b/webroot/common/ui/js/controller.utils.js
@@ -324,7 +324,7 @@ define([
             var modelConfig = {
                 remote: {
                     ajaxConfig: {
-                        url: ctwc.URL_ALL_PROJECTS
+                        url: ctwc.getProjectsURL(domainObj, dropdownOptions)
                     },
                     dataParser: function(response) {
                         return  $.map(response.projects, function (n, i) {

diff --git a/webroot/monitor/networking/test/ui/views/ProjectListView.test.js b/webroot/monitor/networking/test/ui/views/ProjectListView.test.js
@@ -33,7 +33,7 @@ define([
             body: JSON.stringify(TestMockdata.domainsMockData)
         }));
         responses.push(cotr.createFakeServerResponse( {
-            url: cttu.getRegExForUrl(ctwc.URL_PROJECTS),
+            url: cttu.getRegExForUrl(ctwc.URL_ALL_PROJECTS),
             body: JSON.stringify(TestMockdata.projectMockData)
         }));