zware/awx
1
0
Fork 0
mirror of https://github.com/ZwareBear/awx.git synced 2026-04-03 14:41:49 -05:00
Code Issues Packages Projects Releases Wiki Activity

Enable timeout feature to remain functional after upgrade

Browse Source 
Have the UI spinner fill with a default upon notification type change or
upgrade.
This commit is contained in:
beeankha
2019-03-26 10:04:30 -04:00
parent 2bda81661e
commit f5ea595763
2 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
awx/ui/client/src/notifications/edit/edit.controller.js
View File

@@ -86,6 +86,10 @@ export default ['Rest', 'Wait',
}
}
else {
if (data.notification_configuration.timeout === null ||
!data.notification_configuration.timeout){
$scope.timeout = 30;
}
if (data.notification_configuration[fld]) {
$scope[fld] = data.notification_configuration[fld];
master[fld] = data.notification_configuration[fld];
@@ -193,7 +197,11 @@ export default ['Rest', 'Wait',
$scope[subFldName] = null;
$scope.notification_template_form[subFldName].$setPristine();
}
} else {
}
if ($scope.timeout === null || !$scope.timeout) {
$scope.timeout = 30;
}
else {
$scope[fld] = null;
$scope.notification_template_form[fld].$setPristine();
}