BigW Consortium Gitlab

Skip to content

G
gitlab-ce
Commit 8cc9ab50 by Phil Hughes
Options

Merge branch '33853-environments-buttons' into 'master'

Only show gray footer space if environment actions exist Closes #33853 See merge request !12315
parents afbb93f7 2e9a1ebb
Showing with 13 additions and 2 deletions
app/assets/javascripts/environments/components/environment_item.vue
...@@ -403,6 +403,14 @@ export default { ...@@ -403,6 +403,14 @@ export default {
return ''; return '';
}, },
displayEnvironmentActions() {
return this.hasManualActions ||
this.externalURL ||
this.monitoringUrl ||
this.hasStopAction ||
this.canRetry;
},
/** /**
* Constructs folder URL based on the current location and the folder id. * Constructs folder URL based on the current location and the folder id.
* *
...@@ -535,9 +543,12 @@ export default { ...@@ -535,9 +543,12 @@ export default {
</span> </span>
</div> </div>
<div class="table-section section-30 table-button-footer" role="gridcell">
<div <div
v-if="!model.isFolder" v-if="!model.isFolder && displayEnvironmentActions"
class="table-section section-30 table-button-footer"
role="gridcell">
<div
class="btn-group table-action-buttons" class="btn-group table-action-buttons"
role="group"> role="group">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment