Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
27e26d94
Commit
27e26d94
authored
Sep 24, 2020
by
Evan Read
Committed by
Natalia Tepluhina
Sep 24, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Migrate badge list row buttons to new buttons
parent
55f69cbd
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
20 additions
and
14 deletions
+20
-14
app/assets/javascripts/badges/components/badge_list_row.vue
app/assets/javascripts/badges/components/badge_list_row.vue
+15
-14
changelogs/unreleased/eread-migrate-badge-list-row-buttons-to-new-buttons.yml
...d/eread-migrate-badge-list-row-buttons-to-new-buttons.yml
+5
-0
No files found.
app/assets/javascripts/badges/components/badge_list_row.vue
View file @
27e26d94
<
script
>
<
script
>
import
{
mapActions
,
mapState
}
from
'
vuex
'
;
import
{
mapActions
,
mapState
}
from
'
vuex
'
;
import
{
GlLoadingIcon
,
Gl
Ic
on
}
from
'
@gitlab/ui
'
;
import
{
GlLoadingIcon
,
Gl
Butt
on
}
from
'
@gitlab/ui
'
;
import
{
s__
}
from
'
~/locale
'
;
import
{
s__
}
from
'
~/locale
'
;
import
{
PROJECT_BADGE
}
from
'
../constants
'
;
import
{
PROJECT_BADGE
}
from
'
../constants
'
;
import
Badge
from
'
./badge.vue
'
;
import
Badge
from
'
./badge.vue
'
;
...
@@ -9,8 +9,8 @@ export default {
...
@@ -9,8 +9,8 @@ export default {
name
:
'
BadgeListRow
'
,
name
:
'
BadgeListRow
'
,
components
:
{
components
:
{
Badge
,
Badge
,
GlIcon
,
GlLoadingIcon
,
GlLoadingIcon
,
GlButton
,
},
},
props
:
{
props
:
{
badge
:
{
badge
:
{
...
@@ -51,24 +51,25 @@ export default {
...
@@ -51,24 +51,25 @@ export default {
<span
class=
"table-section section-30 str-truncated"
>
{{
badge
.
linkUrl
}}
</span>
<span
class=
"table-section section-30 str-truncated"
>
{{
badge
.
linkUrl
}}
</span>
<div
class=
"table-section section-10 table-button-footer"
>
<div
class=
"table-section section-10 table-button-footer"
>
<div
v-if=
"canEditBadge"
class=
"table-action-buttons"
>
<div
v-if=
"canEditBadge"
class=
"table-action-buttons"
>
<button
<
gl-
button
:disabled=
"badge.isDeleting"
:disabled=
"badge.isDeleting"
class=
"btn btn-default gl-mr-3"
class=
"gl-mr-3"
type=
"button"
variant=
"default"
icon=
"pencil"
size=
"medium"
:aria-label=
"__('Edit')"
@
click=
"editBadge(badge)"
@
click=
"editBadge(badge)"
>
/>
<gl-icon
:size=
"16"
:aria-label=
"__('Edit')"
name=
"pencil"
/>
<gl-button
</button>
<button
:disabled=
"badge.isDeleting"
:disabled=
"badge.isDeleting"
class=
"btn btn-danger"
variant=
"danger"
type=
"button"
data-toggle=
"modal"
data-toggle=
"modal"
data-target=
"#delete-badge-modal"
data-target=
"#delete-badge-modal"
icon=
"remove"
size=
"medium"
:aria-label=
"__('Delete')"
@
click=
"updateBadgeInModal(badge)"
@
click=
"updateBadgeInModal(badge)"
>
/>
<gl-icon
:size=
"16"
:aria-label=
"__('Delete')"
name=
"remove"
/>
</button>
<gl-loading-icon
v-show=
"badge.isDeleting"
:inline=
"true"
/>
<gl-loading-icon
v-show=
"badge.isDeleting"
:inline=
"true"
/>
</div>
</div>
</div>
</div>
...
...
changelogs/unreleased/eread-migrate-badge-list-row-buttons-to-new-buttons.yml
0 → 100644
View file @
27e26d94
---
title
:
Migrate badge list row buttons to new buttons
merge_request
:
43072
author
:
type
:
other
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment