kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Fixes not working dropdowns in pipelines page

Browse source 
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:
Filipa Lacerda 2019-02-12 15:23:58 +01:00
parent 937255196c
commit 4da7be733d
4 changed files with 27 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
app/assets/javascripts/pipelines/components/pipelines_actions.vue
View file

@ -59,17 +59,19 @@ export default {
</script> </script>
<template> <template>
<div class="btn-group"> <div class="btn-group">
<gl-button <button
v-gl-tooltip v-gl-tooltip
type="button"
:disabled="isLoading" :disabled="isLoading"
class="dropdown-new btn btn-default js-pipeline-dropdown-manual-actions" class="dropdown-new btn btn-default js-pipeline-dropdown-manual-actions"
title="Manual job" :title="__('Manual job')"
data-toggle="dropdown" 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-loading-icon v-if="isLoading" />
</gl-button> </button>
<ul class="dropdown-menu dropdown-menu-right"> <ul class="dropdown-menu dropdown-menu-right">
<li v-for="action in actions" :key="action.path"> <li v-for="action in actions" :key="action.path">

23
app/assets/javascripts/pipelines/components/pipelines_artifacts.vue
View file

@ -1,5 +1,5 @@
<script> <script>
import { GlLink, GlButton, GlTooltipDirective } from '@gitlab/ui'; import { GlLink, GlTooltipDirective } from '@gitlab/ui';
import Icon from '~/vue_shared/components/icon.vue'; import Icon from '~/vue_shared/components/icon.vue';
export default { export default {
@ -9,7 +9,6 @@ export default {
components: { components: {
Icon, Icon,
GlLink, GlLink,
GlButton,
}, },
props: { props: {
artifacts: { artifacts: {
@ -21,20 +20,22 @@ export default {
</script> </script>
<template> <template>
<div class="btn-group" role="group"> <div class="btn-group" role="group">
<gl-button <button
v-gl-tooltip v-gl-tooltip
class="dropdown-toggle build-artifacts js-pipeline-dropdown-download" type="button"
title="Artifacts" class="dropdown-toggle build-artifacts btn btn-default js-pipeline-dropdown-download"
:title="__('Artifacts')"
data-toggle="dropdown" data-toggle="dropdown"
aria-label="Artifacts" :aria-label="__('Artifacts')"
> >
<icon name="download" /> <i class="fa fa-caret-down" aria-hidden="true"> </i> <icon name="download" />
</gl-button> <i class="fa fa-caret-down" aria-hidden="true"></i>
</button>
<ul class="dropdown-menu dropdown-menu-right"> <ul class="dropdown-menu dropdown-menu-right">
<li v-for="(artifact, i) in artifacts" :key="i"> <li v-for="(artifact, i) in artifacts" :key="i">
<gl-link :href="artifact.path" rel="nofollow" download> <gl-link :href="artifact.path" rel="nofollow" download
Download {{ artifact.name }} artifacts >Download {{ artifact.name }} artifacts</gl-link
</gl-link> >
</li> </li>
</ul> </ul>
</div> </div>

5
changelogs/unreleased/55893-artifacts-download.yml Normal file
View file

@ -0,0 +1,5 @@
---
title: Fixes not working dropdowns in pipelines page
merge_request:
author:
type: fixed

3
locale/gitlab.pot
View file

@ -4428,6 +4428,9 @@ msgstr ""
msgid "Manifest file import" msgid "Manifest file import"
msgstr "" msgstr ""
msgid "Manual job"
msgstr ""
msgid "Map a FogBugz account ID to a GitLab user" msgid "Map a FogBugz account ID to a GitLab user"
msgstr "" msgstr ""