Add in comment field for pushes
This commit is contained in:
parent
d9d0df9d5e
commit
595765d7bd
|
@ -35,6 +35,13 @@ export class GitRepoDialogComponent {
|
|||
rows: 5,
|
||||
readonly: true,
|
||||
}
|
||||
},
|
||||
{
|
||||
key: 'comment',
|
||||
type:'input',
|
||||
templateOptions: {
|
||||
label: 'Enter a comment for this commit: '
|
||||
}
|
||||
}
|
||||
]
|
||||
});
|
||||
|
@ -63,7 +70,7 @@ export class GitRepoDialogComponent {
|
|||
|
||||
onSubmit() {
|
||||
// I think all we actually will return here is the comment
|
||||
this.dialogRef.close(this.model);
|
||||
this.dialogRef.close(this.model.comment);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -378,25 +378,26 @@ export class WorkflowSpecListComponent implements OnInit {
|
|||
|
||||
});
|
||||
const dialogRef = this.dialog.open(GitRepoDialogComponent, {
|
||||
height: '50vh',
|
||||
height: '58vh',
|
||||
width: '50vw',
|
||||
});
|
||||
// display to user the changed files
|
||||
let comment = '';
|
||||
let branch = 'dan'; // I think this can be set from the gitrepo call above
|
||||
|
||||
/**
|
||||
// if they accept, call gitPush and gitMerge (i think)
|
||||
this.api.gitRepoPush(comment).subscribe(data => {
|
||||
this.api.gitRepoMerge(branch).subscribe(merge => {
|
||||
/** WIP - actually do the push and merge
|
||||
dialogRef.afterClosed().subscribe((comment: string) => {
|
||||
// if they accept, call gitPush and gitMerge (i think)
|
||||
this.api.gitRepoPush(comment).subscribe(data => {
|
||||
this.api.gitRepoMerge(branch).subscribe(merge => {
|
||||
|
||||
});
|
||||
});
|
||||
});
|
||||
*/
|
||||
)};
|
||||
*/
|
||||
}
|
||||
|
||||
gitPull() {
|
||||
// this won't have a popup or nothing i don't think
|
||||
this.api.gitRepoPull().subscribe(data => {
|
||||
|
||||
});
|
||||
|
|
Loading…
Reference in New Issue