diff --git a/src/app/app.component.ts b/src/app/app.component.ts index d1b7cb3..3750c8c 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -379,8 +379,8 @@ export class AppComponent implements OnInit, OnDestroy { this.specialSideBarMenuItem = null; this.adminMenuItems.push(new MenuItem("stakeholders", "Manage profiles", "", "/admin", false, [], [], {}, {name: 'settings'})); if (Session.isPortalAdministrator(this.user)) { - this.adminMenuItems.push(new MenuItem("super_admin", "Super Admin Options", "", "/admin/admin-tools/portals", false, [], [], {}, {name: 'settings'}, null, null, 'admin/admin-tools')); - this.adminMenuItems.push(new MenuItem("monitor", "Monitor Options", "", "/admin/monitor/admin-tools/pages", false, [], [], {}, {name: 'settings'}, null, null, 'admin/monitor/admin-tools')); + this.adminMenuItems.push(new MenuItem("super_admin", "Super Admin Options", "", "/admin/admin-tools/portals", false, [], [], {}, {name: 'settings'}, null, null, '/admin/admin-tools')); + this.adminMenuItems.push(new MenuItem("monitor", "Monitor Options", "", "/admin/monitor/admin-tools/pages", false, [], [], {}, {name: 'settings'}, null, null, '/admin/monitor/admin-tools')); } this.hasAdminMenu = this.hasAdminMenu && this.adminMenuItems.length > 0; } diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary index 5e1fde7..4625ebf 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit 5e1fde78411e2913c3757534a073ace32a4eacf2 +Subproject commit 4625ebf9674e4ffd185bcbee050737b99f690cc4 diff --git a/src/app/utils/adminDashboard.guard.ts b/src/app/utils/adminDashboard.guard.ts index 9139de5..11e97f5 100644 --- a/src/app/utils/adminDashboard.guard.ts +++ b/src/app/utils/adminDashboard.guard.ts @@ -31,7 +31,6 @@ export class AdminDashboardGuard implements CanActivate, CanActivateChild { res[0] && res[1] && (Session.isPortalAdministrator(res[0]) || Session.isCurator(res[1].type, res[0]) || Session.isManager(res[1].type, res[1].alias, res[0])) ),tap(authorized => { - console.log(authorized); if(!authorized){ this.router.navigate(['/user-info'], {queryParams: {'errorCode': LoginErrorCodes.NOT_ADMIN, 'redirectUrl':path}}); } diff --git a/src/assets/common-assets b/src/assets/common-assets index 752859b..1c7b422 160000 --- a/src/assets/common-assets +++ b/src/assets/common-assets @@ -1 +1 @@ -Subproject commit 752859b10d3e110fdc9a4360bb7cb005ef6225ed +Subproject commit 1c7b42284c58024e7d51cb0ae7c5c27f997c646d diff --git a/src/assets/dashboard-theme b/src/assets/dashboard-theme index cd1a176..d2afff9 160000 --- a/src/assets/dashboard-theme +++ b/src/assets/dashboard-theme @@ -1 +1 @@ -Subproject commit cd1a176ceb3aaa3493e16fc4d7ef67749655f351 +Subproject commit d2afff99f1b7fd5e2f143191dc836bba56bdb8ca diff --git a/src/styles.less b/src/styles.less index 8d596d2..8be643c 100644 --- a/src/styles.less +++ b/src/styles.less @@ -2,9 +2,5 @@ /* Import OpenAIRE theme*/ @import "~src/assets/openaire-theme/less/_import"; -//@import "assets/openaire-theme/css/import.css"; -//@import "assets/common-assets/library.css"; @import "assets/monitor-dashboard-custom"; @import "assets/print.css"; - -/* Deprecated */