Fixes not working dropdowns in pipelines page
glbutton is not meant to work with old dropdowns This commit reverts the update to use gl button and adds i18n to some missing strings
This commit is contained in:
parent
937255196c
commit
4da7be733d
|
@ -59,17 +59,19 @@ export default {
|
|||
</script>
|
||||
<template>
|
||||
<div class="btn-group">
|
||||
<gl-button
|
||||
<button
|
||||
v-gl-tooltip
|
||||
type="button"
|
||||
:disabled="isLoading"
|
||||
class="dropdown-new btn btn-default js-pipeline-dropdown-manual-actions"
|
||||
title="Manual job"
|
||||
:title="__('Manual job')"
|
||||
data-toggle="dropdown"
|
||||
aria-label="Manual job"
|
||||
:aria-label="__('Manual job')"
|
||||
>
|
||||
<icon name="play" class="icon-play" /> <i class="fa fa-caret-down" aria-hidden="true"> </i>
|
||||
<icon name="play" class="icon-play" />
|
||||
<i class="fa fa-caret-down" aria-hidden="true"></i>
|
||||
<gl-loading-icon v-if="isLoading" />
|
||||
</gl-button>
|
||||
</button>
|
||||
|
||||
<ul class="dropdown-menu dropdown-menu-right">
|
||||
<li v-for="action in actions" :key="action.path">
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
<script>
|
||||
import { GlLink, GlButton, GlTooltipDirective } from '@gitlab/ui';
|
||||
import { GlLink, GlTooltipDirective } from '@gitlab/ui';
|
||||
import Icon from '~/vue_shared/components/icon.vue';
|
||||
|
||||
export default {
|
||||
|
@ -9,7 +9,6 @@ export default {
|
|||
components: {
|
||||
Icon,
|
||||
GlLink,
|
||||
GlButton,
|
||||
},
|
||||
props: {
|
||||
artifacts: {
|
||||
|
@ -21,20 +20,22 @@ export default {
|
|||
</script>
|
||||
<template>
|
||||
<div class="btn-group" role="group">
|
||||
<gl-button
|
||||
<button
|
||||
v-gl-tooltip
|
||||
class="dropdown-toggle build-artifacts js-pipeline-dropdown-download"
|
||||
title="Artifacts"
|
||||
type="button"
|
||||
class="dropdown-toggle build-artifacts btn btn-default js-pipeline-dropdown-download"
|
||||
:title="__('Artifacts')"
|
||||
data-toggle="dropdown"
|
||||
aria-label="Artifacts"
|
||||
:aria-label="__('Artifacts')"
|
||||
>
|
||||
<icon name="download" /> <i class="fa fa-caret-down" aria-hidden="true"> </i>
|
||||
</gl-button>
|
||||
<icon name="download" />
|
||||
<i class="fa fa-caret-down" aria-hidden="true"></i>
|
||||
</button>
|
||||
<ul class="dropdown-menu dropdown-menu-right">
|
||||
<li v-for="(artifact, i) in artifacts" :key="i">
|
||||
<gl-link :href="artifact.path" rel="nofollow" download>
|
||||
Download {{ artifact.name }} artifacts
|
||||
</gl-link>
|
||||
<gl-link :href="artifact.path" rel="nofollow" download
|
||||
>Download {{ artifact.name }} artifacts</gl-link
|
||||
>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
|
|
|
@ -0,0 +1,5 @@
|
|||
---
|
||||
title: Fixes not working dropdowns in pipelines page
|
||||
merge_request:
|
||||
author:
|
||||
type: fixed
|
|
@ -4428,6 +4428,9 @@ msgstr ""
|
|||
msgid "Manifest file import"
|
||||
msgstr ""
|
||||
|
||||
msgid "Manual job"
|
||||
msgstr ""
|
||||
|
||||
msgid "Map a FogBugz account ID to a GitLab user"
|
||||
msgstr ""
|
||||
|
||||
|
|
Loading…
Reference in New Issue