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
9f13d025
Commit
9f13d025
authored
3 years ago
by
NataliaTepluhina
Committed by
Florie Guibert
3 years ago
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed old iid update
parent
83681ba7
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
9 deletions
+6
-9
app/assets/javascripts/vue_shared/components/sidebar/labels_select_widget/dropdown_contents.vue
...onents/sidebar/labels_select_widget/dropdown_contents.vue
+4
-1
app/assets/javascripts/vue_shared/components/sidebar/labels_select_widget/labels_select_root.vue
...nents/sidebar/labels_select_widget/labels_select_root.vue
+2
-8
No files found.
app/assets/javascripts/vue_shared/components/sidebar/labels_select_widget/dropdown_contents.vue
View file @
9f13d025
...
@@ -122,13 +122,16 @@ export default {
...
@@ -122,13 +122,16 @@ export default {
if
(
newVal
)
{
if
(
newVal
)
{
this
.
$refs
.
dropdown
.
show
();
this
.
$refs
.
dropdown
.
show
();
this
.
isDirty
=
false
;
this
.
isDirty
=
false
;
this
.
localSelectedLabels
=
this
.
selectedLabels
;
}
else
{
}
else
{
this
.
$refs
.
dropdown
.
hide
();
this
.
$refs
.
dropdown
.
hide
();
this
.
setLabels
();
this
.
setLabels
();
}
}
},
},
selectedLabels
(
newVal
)
{
selectedLabels
(
newVal
)
{
this
.
localSelectedLabels
=
newVal
;
if
(
!
this
.
isDirty
)
{
this
.
localSelectedLabels
=
newVal
;
}
},
},
},
},
created
()
{
created
()
{
...
...
This diff is collapsed.
Click to expand it.
app/assets/javascripts/vue_shared/components/sidebar/labels_select_widget/labels_select_root.vue
View file @
9f13d025
...
@@ -106,7 +106,6 @@ export default {
...
@@ -106,7 +106,6 @@ export default {
issuableLabels
:
[],
issuableLabels
:
[],
labelsSelectInProgress
:
false
,
labelsSelectInProgress
:
false
,
oldIid
:
null
,
oldIid
:
null
,
isEditing
:
false
,
};
};
},
},
computed
:
{
computed
:
{
...
@@ -138,11 +137,7 @@ export default {
...
@@ -138,11 +137,7 @@ export default {
},
},
watch
:
{
watch
:
{
iid
(
_
,
oldVal
)
{
iid
(
_
,
oldVal
)
{
if
(
this
.
isEditing
)
{
this
.
oldIid
=
oldVal
;
this
.
oldIid
=
oldVal
;
}
else
{
this
.
oldIid
=
null
;
}
},
},
},
},
methods
:
{
methods
:
{
...
@@ -259,8 +254,7 @@ export default {
...
@@ -259,8 +254,7 @@ export default {
:title=
"__('Labels')"
:title=
"__('Labels')"
:loading=
"isLoading"
:loading=
"isLoading"
:can-edit=
"allowLabelEdit"
:can-edit=
"allowLabelEdit"
@
open=
"isEditing = true"
@
open=
"oldIid = null"
@
close=
"isEditing = false"
>
>
<template
#collapsed
>
<template
#collapsed
>
<dropdown-value
<dropdown-value
...
...
This diff is collapsed.
Click to expand it.
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