diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2017-04-03 17:54:16 +0100 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2017-04-03 17:55:36 +0100 |
| commit | 3db1b959f6488cf861a2bdf32f1c5ff336f7a881 (patch) | |
| tree | cfdfa7427f71fe7ce005a54e3c1960eaf2765bfa | |
| parent | 1b85c5a73fb4e7b466d3d871be7d7eb4b889b3ce (diff) | |
| download | gitlab-ce-3db1b959f6488cf861a2bdf32f1c5ff336f7a881.tar.gz | |
Buttons will be disabled when playable key is false
3 files changed, 14 insertions, 4 deletions
diff --git a/app/assets/javascripts/environments/components/environment_actions.js b/app/assets/javascripts/environments/components/environment_actions.js index 385085c03e2..49b3ae683d0 100644 --- a/app/assets/javascripts/environments/components/environment_actions.js +++ b/app/assets/javascripts/environments/components/environment_actions.js @@ -50,6 +50,7 @@ export default { template: ` <div class="btn-group" role="group"> <button + type="button" class="dropdown btn btn-default dropdown-new js-dropdown-play-icon-container has-tooltip" data-container="body" data-toggle="dropdown" @@ -65,8 +66,11 @@ export default { <ul class="dropdown-menu dropdown-menu-align-right"> <li v-for="action in actions"> <button + type="button" @click="onClickAction(action.play_path)" - class="js-manual-action-link no-btn"> + class="js-manual-action-link no-btn btn" + :class="{ 'disabled': !actions.playable }" + :disabled="!action.playable"> ${playIconSvg} <span> {{action.name}} diff --git a/app/assets/javascripts/vue_pipelines_index/components/pipelines_actions.js b/app/assets/javascripts/vue_pipelines_index/components/pipelines_actions.js index 4bb2b048884..8e9850233ab 100644 --- a/app/assets/javascripts/vue_pipelines_index/components/pipelines_actions.js +++ b/app/assets/javascripts/vue_pipelines_index/components/pipelines_actions.js @@ -49,7 +49,7 @@ export default { data-toggle="dropdown" data-placement="top" aria-label="Manual job" - :disabled="isLoading"> + :disabled="isDisabled"> ${playIconSvg} <i class="fa fa-caret-down" aria-hidden="true"></i> <i v-if="isLoading" class="fa fa-spinner fa-spin" aria-hidden="true"></i> @@ -59,8 +59,10 @@ export default { <li v-for="action in actions"> <button type="button" - class="js-pipeline-action-link no-btn" - @click="onClickAction(action.path)"> + class="js-pipeline-action-link no-btn btn" + :class="{ 'disabled': !actions.playable }" + @click="onClickAction(action.path)" + :disabled="!actions.playable"> ${playIconSvg} <span>{{action.name}}</span> </button> diff --git a/changelogs/unreleased/tc-fix-unplayable-build-action-404.yml b/changelogs/unreleased/tc-fix-unplayable-build-action-404.yml new file mode 100644 index 00000000000..c5fb79a3936 --- /dev/null +++ b/changelogs/unreleased/tc-fix-unplayable-build-action-404.yml @@ -0,0 +1,4 @@ +--- +title: Disable pipeline +merge_request: 10052 +author: |