Fix bugs when post form on create job view Fix bugs when post form on create job view
Author: dodobel <[email protected]> Closes #265 from dodobel/button. Project: http://git-wip-us.apache.org/repos/asf/incubator-griffin/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-griffin/commit/0eb177df Tree: http://git-wip-us.apache.org/repos/asf/incubator-griffin/tree/0eb177df Diff: http://git-wip-us.apache.org/repos/asf/incubator-griffin/diff/0eb177df Branch: refs/heads/griffin-0.2.0-incubating-rc4 Commit: 0eb177dfb912552b38e19d53450cc23ef65f740c Parents: ccb9110 Author: dodobel <[email protected]> Authored: Wed Apr 25 13:50:34 2018 +0800 Committer: Lionel Liu <[email protected]> Committed: Wed Apr 25 13:54:27 2018 +0800 ---------------------------------------------------------------------- ui/angular/src/app/job/create-job/create-job.component.html | 2 +- ui/angular/src/app/job/create-job/create-job.component.ts | 2 ++ ui/angular/src/app/job/job.component.html | 2 +- ui/angular/src/app/job/job.component.ts | 2 ++ ui/angular/src/app/measure/create-measure/pub/pub.component.html | 2 +- ui/angular/src/app/measure/create-measure/pub/pub.component.ts | 2 ++ ui/angular/src/app/measure/measure.component.html | 2 +- ui/angular/src/app/measure/measure.component.ts | 3 ++- 8 files changed, 12 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/0eb177df/ui/angular/src/app/job/create-job/create-job.component.html ---------------------------------------------------------------------- diff --git a/ui/angular/src/app/job/create-job/create-job.component.html b/ui/angular/src/app/job/create-job/create-job.component.html index 7bf5e37..86b82e3 100644 --- a/ui/angular/src/app/job/create-job/create-job.component.html +++ b/ui/angular/src/app/job/create-job/create-job.component.html @@ -169,7 +169,7 @@ under the License. </div> <div class="modal-footer"> <button type="button" class="btn btn-default" data-dismiss="modal" (click)="hide()">Cancel</button> - <button type="button" class="btn btn-primary" (click)="save()">Save</button> + <button type="button" id="save" class="btn btn-primary" (click)="save()">Save</button> </div> </div> </div> http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/0eb177df/ui/angular/src/app/job/create-job/create-job.component.ts ---------------------------------------------------------------------- diff --git a/ui/angular/src/app/job/create-job/create-job.component.ts b/ui/angular/src/app/job/create-job/create-job.component.ts index 61d1947..2b97728 100644 --- a/ui/angular/src/app/job/create-job/create-job.component.ts +++ b/ui/angular/src/app/job/create-job/create-job.component.ts @@ -110,6 +110,7 @@ export class CreateJobComponent implements OnInit, AfterViewChecked { setTimeout(() => (this.visible = false), 300); this.originBegin = []; this.originLength = []; + $("#save").removeAttr("disabled"); } public onContainerClicked(event: MouseEvent): void { @@ -187,6 +188,7 @@ export class CreateJobComponent implements OnInit, AfterViewChecked { save() { var addJobs = this.serviceService.config.uri.addJobs; + $("#save").attr("disabled", "true"); this.http.post(addJobs, this.newJob).subscribe( data => { this.createResult = data["results"]; http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/0eb177df/ui/angular/src/app/job/job.component.html ---------------------------------------------------------------------- diff --git a/ui/angular/src/app/job/job.component.html b/ui/angular/src/app/job/job.component.html index b78a3c7..f7dab88 100644 --- a/ui/angular/src/app/job/job.component.html +++ b/ui/angular/src/app/job/job.component.html @@ -172,7 +172,7 @@ under the License. </div> </div> <div class="modal-footer"> - <button type="button" class="btn btn-primary" (click)="confirmDelete()">Yes</button> + <button type="button" id="save" class="btn btn-primary" (click)="confirmDelete()">Yes</button> <button type="button" class="btn btn-default" data-dismiss="modal" (click)="hide()">No</button> </div> </div> http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/0eb177df/ui/angular/src/app/job/job.component.ts ---------------------------------------------------------------------- diff --git a/ui/angular/src/app/job/job.component.ts b/ui/angular/src/app/job/job.component.ts index 9a8356d..c5abd4f 100644 --- a/ui/angular/src/app/job/job.component.ts +++ b/ui/angular/src/app/job/job.component.ts @@ -66,6 +66,7 @@ export class JobComponent implements OnInit { } remove(row) { + $("#save").removeAttr("disabled"); this.visible = true; setTimeout(() => (this.visibleAnimate = true), 100); this.deletedRow = row; @@ -81,6 +82,7 @@ export class JobComponent implements OnInit { confirmDelete() { let deleteJob = this.serviceService.config.uri.deleteJob; let deleteUrl = deleteJob + "/" + this.deleteId; + $("#save").attr("disabled", "true"); this.http.delete(deleteUrl).subscribe( data => { let self = this; http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/0eb177df/ui/angular/src/app/measure/create-measure/pub/pub.component.html ---------------------------------------------------------------------- diff --git a/ui/angular/src/app/measure/create-measure/pub/pub.component.html b/ui/angular/src/app/measure/create-measure/pub/pub.component.html index 2dd80ac..7fd8950 100644 --- a/ui/angular/src/app/measure/create-measure/pub/pub.component.html +++ b/ui/angular/src/app/measure/create-measure/pub/pub.component.html @@ -198,7 +198,7 @@ under the License. </div> <div class="modal-footer"> <button type="button" class="btn btn-default" (click)="hide()">Cancel</button> - <button type="button" class="btn btn-primary" (click)="save()">Save</button> + <button type="button" id="save" class="btn btn-primary" (click)="save()">Save</button> </div> </div> </div> http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/0eb177df/ui/angular/src/app/measure/create-measure/pub/pub.component.ts ---------------------------------------------------------------------- diff --git a/ui/angular/src/app/measure/create-measure/pub/pub.component.ts b/ui/angular/src/app/measure/create-measure/pub/pub.component.ts index 99871eb..20f79f7 100644 --- a/ui/angular/src/app/measure/create-measure/pub/pub.component.ts +++ b/ui/angular/src/app/measure/create-measure/pub/pub.component.ts @@ -71,6 +71,7 @@ export class PubComponent implements AfterViewChecked, OnInit { public hide(): void { this.visibleAnimate = false; setTimeout(() => (this.visible = false), 300); + $("#save").removeAttr("disabled"); } public onContainerClicked(event: MouseEvent): void { @@ -149,6 +150,7 @@ export class PubComponent implements AfterViewChecked, OnInit { owner:this.newMeasure.owner } var addModels = this.serviceService.config.uri.addModels; + $("#save").attr("disabled", "true"); this.http.post(addModels, measure2Save).subscribe( data => { this.createResult = data; http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/0eb177df/ui/angular/src/app/measure/measure.component.html ---------------------------------------------------------------------- diff --git a/ui/angular/src/app/measure/measure.component.html b/ui/angular/src/app/measure/measure.component.html index 67f3fa8..5342d63 100644 --- a/ui/angular/src/app/measure/measure.component.html +++ b/ui/angular/src/app/measure/measure.component.html @@ -129,7 +129,7 @@ under the License. </div> <div class="modal-footer"> <p class="delete-alert">If you delete this measure, your running jobs on this measure will also be deleted, please be careful!</p> - <button type="button" class="btn btn-default" (click)="confirmDelete()">Yes</button> + <button type="button" id="save" class="btn btn-default" (click)="confirmDelete()">Yes</button> <button type="button" class="btn btn-primary" (click)="hide()">No</button> </div> </div> http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/0eb177df/ui/angular/src/app/measure/measure.component.ts ---------------------------------------------------------------------- diff --git a/ui/angular/src/app/measure/measure.component.ts b/ui/angular/src/app/measure/measure.component.ts index 6f5acbb..936742a 100644 --- a/ui/angular/src/app/measure/measure.component.ts +++ b/ui/angular/src/app/measure/measure.component.ts @@ -65,12 +65,12 @@ export class MeasureComponent implements OnInit { } remove(row) { - console.log(row); this.visible = true; setTimeout(() => (this.visibleAnimate = true), 100); this.deleteId = row.id; this.deleteIndex = this.results.indexOf(row); this.deletedRow = row; + $("#save").removeAttr("disabled"); if(this.deletedRow["measure.type"]!=="external"){ var sourcedata = this.deletedRow["data.sources"][0].connectors[0].config; this.sourceTable = sourcedata["table.name"]; @@ -86,6 +86,7 @@ export class MeasureComponent implements OnInit { confirmDelete() { var deleteModel = this.serviceService.config.uri.deleteModel; let deleteUrl = deleteModel + "/" + this.deleteId; + $("#save").attr("disabled", "true"); this.http.delete(deleteUrl).subscribe( data => { var self = this;
