MUMUP-2487 : add in user-settings for ajsp

uPortal-Attic · Apr 22, 2016 · 20465bf · 20465bf
1 parent eef9311
commit 20465bf
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/angularjs-portal-home/src/main/webapp/WEB-INF/web.xml b/angularjs-portal-home/src/main/webapp/WEB-INF/web.xml
@@ -92,6 +92,7 @@
       <url-pattern>/apps/*</url-pattern>
       <url-pattern>/features</url-pattern>
       <url-pattern>/settings/*</url-pattern>
+      <url-pattern>user-settings</url-pattern>
       <url-pattern>/notifications</url-pattern>
       <url-pattern>/static/*</url-pattern>
       <url-pattern>/exclusive/*</url-pattern>

diff --git a/angularjs-portal-home/src/main/webapp/js/override.js b/angularjs-portal-home/src/main/webapp/js/override.js
@@ -13,7 +13,8 @@ define(['angular'], function(angular) {
             'expanded' : true,
             'isWeb' : true,
             'defaultTheme' : 'group',
-            'debug' : true
+            'debug' : true,
+            'showUserSettingsPage' : true
           },
           'FEATURES' : {
             enabled: true

diff --git a/angularjs-portal-home/src/main/webapp/my-app/main.js b/angularjs-portal-home/src/main/webapp/my-app/main.js
@@ -4,7 +4,7 @@ define([
     './marketplace/routes',
     './layout/list/route',
     'portal/notifications/route',
-    'portal/settings/route',
+    'portal/settings/routes',
     'portal/features/route',
     'portal/about/route',
     './layout/route',
@@ -29,7 +29,7 @@ define([
     './marketplace/services',
     './search/controllers',
     './search/services'
-], function(angular, require, marketplaceRoutes, listRoute, notificationsRoute, portalSettingsRoute, featuresRoute, aboutRoute, layoutRoute, staticRoutes, widgetRoutes, searchRoutes) {
+], function(angular, require, marketplaceRoutes, listRoute, notificationsRoute, portalSettingsRoutes, featuresRoute, aboutRoute, layoutRoute, staticRoutes, widgetRoutes, searchRoutes) {
 
     var app = angular.module('my-app', [
         'app-config',
@@ -63,7 +63,8 @@ define([
             when('/compact', listRoute).
             when('/expanded', widgetRoutes.widgetView).
             when('/notifications', notificationsRoute).
-            when('/settings', portalSettingsRoute).
+            when('/settings', portalSettingsRoutes.betaSettings).
+            when('/user-settings', portalSettingsRoutes.userSettings).
             when('/features', featuresRoute).
             when('/static/:fname', staticRoutes.staticMax).
             when('/exclusive/:fname', staticRoutes.exclusiveMax).