Adding in directory

uPortal-Attic · Jan 27, 2016 · 3980c19 · 3980c19
1 parent 1d5d07d
commit 3980c19
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/angularjs-portal-home/src/main/webapp/js/app-config.js b/angularjs-portal-home/src/main/webapp/js/app-config.js
@@ -30,7 +30,7 @@ define(['angular'], function(angular) {
             },
             'notificationsURL' : '/web/staticFeeds/notifications.json',
             'groupURL' : '/portal/api/groups',
-            'kvURL' : '/storage/',
+            'kvURL' : '/storage',
             'googleSearchURL' : '/web/api/wiscedusearch?v=1.0&rsz=10&start=0&cx=001601028090761970182:2g0iwqsnk2m',
             'wiscDirectorySearchURL' : '/web/api/wiscdirectory'
         })

diff --git a/angularjs-portal-home/src/main/webapp/my-app/search/controllers.js b/angularjs-portal-home/src/main/webapp/my-app/search/controllers.js
@@ -72,6 +72,7 @@ define(['angular', 'portal/search/controllers', 'my-app/marketplace/controllers'
         $scope.myuwResults = [];
         $scope.googleResults = [];
         $scope.wiscDirectoryResults = [];
+        $scope.wiscDirectoryResultCount = 0;
         $scope.googleResultsEstimatedCount = 0;
         $scope.totalCount = 0;
         $scope.searchResultLimit = 20;
@@ -90,6 +91,9 @@ define(['angular', 'portal/search/controllers', 'my-app/marketplace/controllers'
           if($scope.myuwFilteredResults){
             $scope.totalCount+= parseInt($scope.myuwFilteredResults.length);
           }
+          if($scope.wiscDirectoryResultCount){
+              $scope.totalCount+= parseInt($scope.wiscDirectoryResultCount);
+            }
         });
       };
       init();