External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-07 17:37:37 -02:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8540 from marshmalien/8461-notification-detail-link

Browse Source 
Fix notification list to notification list item detail link

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
This commit is contained in:
softwarefactory-project-zuul[bot]
2020-11-05 22:23:47 +00:00
committed by GitHub
parent dccddfffe6 52c8033a08
commit 0567a2a3bf
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
awx/ui_next/src/components/NotificationList/NotificationList.jsx
View File

@@ -219,7 +219,7 @@ function NotificationList({
<NotificationListItem <NotificationListItem
key={notification.id} key={notification.id}
notification={notification} notification={notification}
detailUrl={`/notifications/${notification.id}`} detailUrl={`/notification_templates/${notification.id}/details`}
canToggleNotifications={ canToggleNotifications={
canToggleNotifications && canToggleNotifications &&
!loadingToggleIds.includes(notification.id) !loadingToggleIds.includes(notification.id)

4
awx/ui_next/src/screens/NotificationTemplate/NotificationTemplate.jsx
View File

@@ -18,6 +18,7 @@ import ContentError from '../../components/ContentError';
import { NotificationTemplatesAPI } from '../../api'; import { NotificationTemplatesAPI } from '../../api';
import NotificationTemplateDetail from './NotificationTemplateDetail'; import NotificationTemplateDetail from './NotificationTemplateDetail';
import NotificationTemplateEdit from './NotificationTemplateEdit'; import NotificationTemplateEdit from './NotificationTemplateEdit';
import ContentLoading from '../../components/ContentLoading';
function NotificationTemplate({ setBreadcrumb, i18n }) { function NotificationTemplate({ setBreadcrumb, i18n }) {
const { id: templateId } = useParams(); const { id: templateId } = useParams();
@@ -94,20 +95,19 @@ function NotificationTemplate({ setBreadcrumb, i18n }) {
to="/notification_templates/:id/details" to="/notification_templates/:id/details"
exact exact
/> />
{isLoading && <ContentLoading />}
{template && ( {template && (
<> <>
<Route path="/notification_templates/:id/edit"> <Route path="/notification_templates/:id/edit">
<NotificationTemplateEdit <NotificationTemplateEdit
template={template} template={template}
defaultMessages={defaultMessages} defaultMessages={defaultMessages}
isLoading={isLoading}
/> />
</Route> </Route>
<Route path="/notification_templates/:id/details"> <Route path="/notification_templates/:id/details">
<NotificationTemplateDetail <NotificationTemplateDetail
template={template} template={template}
defaultMessages={defaultMessages} defaultMessages={defaultMessages}
isLoading={isLoading}
/> />
</Route> </Route>
</> </>