diff --git a/lib/pipeline/addon/components/pipeline-jobs-table/template.hbs b/lib/pipeline/addon/components/pipeline-jobs-table/template.hbs index 7a17bd387..954062096 100644 --- a/lib/pipeline/addon/components/pipeline-jobs-table/template.hbs +++ b/lib/pipeline/addon/components/pipeline-jobs-table/template.hbs @@ -52,10 +52,13 @@ {{date-from-now inst.nextStart}} {{/tooltip-element}} {{/if}} - {{#if inst.triggerWebhook}} -

{{t 'pipelinesPage.awaitingWebhook'}}

+ {{#if inst.triggerWebhookPush}} +

{{t 'pipelinesPage.awaitingWebhookPush'}}

{{/if}} - {{#unless (or inst.triggerWebhook inst.nextStart)}} + {{#if inst.triggerWebhookPr}} +

{{t 'pipelinesPage.awaitingWebhookPR'}}

+ {{/if}} + {{#unless (or inst.triggerWebhookPush inst.triggerWebhookPr inst.nextStart)}} {{t 'pipelinesPage.triggerManually'}} {{/unless}} diff --git a/lib/pipeline/addon/components/pipeline-trigger/component.js b/lib/pipeline/addon/components/pipeline-trigger/component.js index 9c89e17da..c8787f0d5 100644 --- a/lib/pipeline/addon/components/pipeline-trigger/component.js +++ b/lib/pipeline/addon/components/pipeline-trigger/component.js @@ -76,11 +76,11 @@ export default Component.extend({ }.observes('state.setCustomCron'), observeOptionsChange: function(){ let trigger={ - webhook: this.get('pipeline.triggerWebhook'), + webhook: this.get('pipeline.triggerWebhookPush'), cron: !!this.get('state.setCustomCron') } this.sendAction('triggerOptionsChange', trigger); - }.observes('pipeline.triggerWebhook', 'state.setCustomCron'), + }.observes('pipeline.triggerWebhookPush', 'state.setCustomCron'), didInsertElement(){ this.initTimeZone(); this.cronObserve(); diff --git a/lib/pipeline/addon/components/pipeline-trigger/template.hbs b/lib/pipeline/addon/components/pipeline-trigger/template.hbs index 2fe8cdee6..5a98462dc 100644 --- a/lib/pipeline/addon/components/pipeline-trigger/template.hbs +++ b/lib/pipeline/addon/components/pipeline-trigger/template.hbs @@ -3,7 +3,7 @@
- {{input disabled=(or disabled webhookDisabled) type="checkbox" id="webhook" checked=pipeline.triggerWebhook}} + {{input disabled=(or disabled webhookDisabled) type="checkbox" id="webhook" checked=pipeline.triggerWebhookPush}} diff --git a/lib/pipeline/translations/en-us.yaml b/lib/pipeline/translations/en-us.yaml index 8bb540e84..f2a9bc5d7 100644 --- a/lib/pipeline/translations/en-us.yaml +++ b/lib/pipeline/translations/en-us.yaml @@ -39,7 +39,8 @@ pipelinesPage: inactive: Inactive lastActivity: LastActivity nextRun: NextRun - awaitingWebhook: Awaiting Webhook + awaitingWebhookPush: Awaiting Push + awaitingWebhookPR: Awaiting PR triggerManually: Trigger Manually notDeployed: Pipeline is not enabled, click here to enable Pipline pipelinesSetting: