Skip to content

Commit 79cab86

Browse files
committed
Revert "Notifications display bug"
This reverts commit 862e035.
1 parent d08b1b5 commit 79cab86

File tree

6 files changed

+13
-5
lines changed

6 files changed

+13
-5
lines changed
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
<span class="subheading-class">{{notificationGroup.unreadCount}} {{'New' | translate}}</span>

client/app/core/core.module.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import { ExceptionModule } from './exception/exception.module.js'
2323
import { LanguageFactory } from './language.service.js'
2424
import { ListConfigurationFactory } from './list-configuration.service.js'
2525
import { ListViewFactory } from './list-view.service.js'
26-
import { NavigationController } from './navigation/navigation-controller.js'
26+
import { NavigationController, navigationInit } from './navigation/navigation-controller.js'
2727
import { NavigationFactory } from './navigation.service.js'
2828
import { PollingFactory } from './polling.service.js'
2929
import { RBACFactory } from './rbac.service.js'
@@ -93,4 +93,5 @@ export const CoreModule = angular
9393
.run(authInit)
9494
.run(gettextInit)
9595
.run(layoutInit)
96+
.run(navigationInit)
9697
.name

client/app/core/navigation/navigation-controller.js

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,6 @@ export function NavigationController (Text, Navigation, Session, API_BASE, Shopp
6060
helpMenu: RBAC.hasAny(['about', 'product', 'documentation'])
6161
}
6262
EventNotifications.setToastDisplay(vm.permissions.suiNotifications)
63-
const appBasePath = process.env.NODE_ENV === 'production' ? '' : 'assets/'
6463
angular.extend(vm, {
6564
state: Navigation.state,
6665
text: Text.app,
@@ -72,9 +71,10 @@ export function NavigationController (Text, Navigation, Session, API_BASE, Shopp
7271
notificationsDrawerShown: false,
7372
newNotifications: false,
7473
html: {
75-
heading: `${appBasePath}html/heading.html`,
76-
notificationBody: `${appBasePath}html/notification-body.html`,
77-
notificationFooter: `${appBasePath}html/notification-footer.html`,
74+
// injected into templateCache by navigationInit
75+
heading: 'notifications/heading.html',
76+
notificationBody: 'notifications/notification-body.html',
77+
notificationFooter: 'notifications/notification-footer.html',
7878
},
7979
handleItemClick: handleItemClick,
8080
toggleNotificationsList: () => { vm.notificationsDrawerShown = !vm.notificationsDrawerShown },
@@ -250,3 +250,9 @@ export function NavigationController (Text, Navigation, Session, API_BASE, Shopp
250250
}
251251
}
252252

253+
/** @ngInject */
254+
export const navigationInit = function($templateCache) {
255+
$templateCache.put('notifications/heading.html', require('../../components/notifications/heading.html'));
256+
$templateCache.put('notifications/notification-body.html', require('../../components/notifications/notification-body.html'));
257+
$templateCache.put('notifications/notification-footer.html', require('../../components/notifications/notification-footer.html'));
258+
};

0 commit comments

Comments
 (0)