Skip to content

Commit

Permalink
Change the word Terminated by Finished for backups
Browse files Browse the repository at this point in the history
  • Loading branch information
olivierlambert committed Jan 22, 2016
1 parent 9a26471 commit f9028cb
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion app/modules/backup/management/index.js
Expand Up @@ -79,7 +79,7 @@ export default angular.module('backup.management', [
}
entry.end = time
entry.duration = time - entry.start
entry.status = 'Terminated'
entry.status = 'Finished'
} else if (data.event === 'jobCall.start') {
entry.calls[logKey] = {
callKey: logKey,
Expand Down
4 changes: 2 additions & 2 deletions app/modules/backup/management/view.jade
Expand Up @@ -58,9 +58,9 @@
td {{ log.end | date:'medium' }}
td {{ log.duration | duration}}
td
span(ng-if = 'log.status === "Terminated"')
span(ng-if = 'log.status === "Finished"')
span.label(ng-class = '{"label-success": (!log.error && !log.hasErrors), "label-danger": (log.error || log.hasErrors)}') {{ log.status }}
span.label(ng-if = 'log.status !== "Terminated"', ng-class = '{"label-warning": log.status === "In progress", "label-default": !log.status}') {{ log.status || "unknown" }}
span.label(ng-if = 'log.status !== "Finished"', ng-class = '{"label-warning": log.status === "In progress", "label-default": !log.status}') {{ log.status || "unknown" }}
p.text-danger(ng-if = 'log.error')  {{ log.error }}
tr.bg-info(collapse = '!seeCalls')
td(colspan = '6')
Expand Down
2 changes: 1 addition & 1 deletion app/modules/task-scheduler/overview/index.js
Expand Up @@ -64,7 +64,7 @@ export default angular.module('taskscheduler.overview', [
}
entry.end = time
entry.duration = time - entry.start
entry.status = 'Terminated'
entry.status = 'Finished'
} else if (data.event === 'jobCall.start') {
entry.calls[logKey] = {
callKey: logKey,
Expand Down
4 changes: 2 additions & 2 deletions app/modules/task-scheduler/overview/view.jade
Expand Up @@ -57,9 +57,9 @@
td {{ log.end | date:'medium' }}
td {{ log.duration | duration}}
td
span(ng-if = 'log.status === "Terminated"')
span(ng-if = 'log.status === "Finished"')
span.label(ng-class = '{"label-success": (!log.error && !log.hasErrors), "label-danger": (log.error || log.hasErrors)}') {{ log.status }}
span.label(ng-if = 'log.status !== "Terminated"', ng-class = '{"label-warning": log.status === "In progress", "label-default": !log.status}') {{ log.status || "unknown" }}
span.label(ng-if = 'log.status !== "Finished"', ng-class = '{"label-warning": log.status === "In progress", "label-default": !log.status}') {{ log.status || "unknown" }}
p.text-danger(ng-if = 'log.error')  {{ log.error }}
tr.bg-info(collapse = '!seeCalls')
td(colspan = '5')
Expand Down

0 comments on commit f9028cb

Please sign in to comment.