Skip to content

Commit 9d7dd23

Browse files
committed
Add processing option
1 parent 6083ab9 commit 9d7dd23

4 files changed

Lines changed: 7 additions & 5 deletions

File tree

OpenFlow/src/public/Controllers.ts

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1790,12 +1790,11 @@ export class FormCtrl extends entityCtrl<WorkflowInstance> {
17901790

17911791

17921792
if (this.model.form === "none" || this.model.form === "") {
1793-
if (this.model.state != "failed") {
1793+
if (this.model.state != "failed" && this.model.state != "processing") {
17941794
this.$location.path("/main");
17951795
} else {
1796+
this.hideFormElements();
17961797
if (this.model.state == "failed") {
1797-
this.hideFormElements();
1798-
17991798
if ((this.model as any).error != null && (this.model as any).error != "") {
18001799
this.errormessage = (this.model as any).error;
18011800
} else if (!this.model.payload) {
@@ -1808,6 +1807,8 @@ export class FormCtrl extends entityCtrl<WorkflowInstance> {
18081807
this.errormessage = this.model.payload;
18091808
}
18101809
console.log(this.model.payload);
1810+
} else {
1811+
this.message = "Processing . . .";
18111812
}
18121813
}
18131814
if (!this.$scope.$$phase) { this.$scope.$apply(); }

OpenFlow/src/public/Form.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
<div>{{ ctrl.message}} </div>
21
<style>
32
.alert-alert-success {
43
display: none !important;
54
}
65
</style>
76
<div ng-show="ctrl.errormessage != ''"" class=" alert alert-danger" role="alert">{{ctrl.errormessage}}</div>
7+
<div ng-show="ctrl.message != ''"" class=" alert alert-primary" role="alert">{{ctrl.message}}</div>
88
<form id="workflowform" ng-submit="ctrl.Save()">
99
<div class="render-wrap" ng-show="ctrl.form.fbeditor==true">
1010
</div>

OpenFlowNodeRED/src/nodered/nodes/workflow.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@
5555
<option>idle</option>
5656
<option>completed</option>
5757
<option>failed</option>
58+
<option>processing</option>
5859
</select>
5960
</div>
6061
<div class="form-row">

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.0.79
1+
1.0.80

0 commit comments

Comments
 (0)