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
0
Merge Requests
0
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
Léo-Paul Géneau
gitlab-ce
Commits
b13213e6
Commit
b13213e6
authored
Sep 27, 2016
by
Phil Hughes
Committed by
Mike Greiling
Sep 27, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Send ajax request for label update only if they are changed (#19472 !5071)
parent
3820ca58
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
35 additions
and
8 deletions
+35
-8
CHANGELOG
CHANGELOG
+1
-0
app/assets/javascripts/labels_select.js
app/assets/javascripts/labels_select.js
+10
-1
spec/features/issues_spec.rb
spec/features/issues_spec.rb
+18
-0
spec/javascripts/labels_issue_sidebar_spec.js.es6
spec/javascripts/labels_issue_sidebar_spec.js.es6
+6
-7
No files found.
CHANGELOG
View file @
b13213e6
...
@@ -3,6 +3,7 @@ Please view this file on the master branch, on stable branches it's out of date.
...
@@ -3,6 +3,7 @@ Please view this file on the master branch, on stable branches it's out of date.
v 8.13.0 (unreleased)
v 8.13.0 (unreleased)
- Speed-up group milestones show page
- Speed-up group milestones show page
- Fix robots.txt disallowing access to groups starting with "s" (Matt Harrison)
- Fix robots.txt disallowing access to groups starting with "s" (Matt Harrison)
- Only update issuable labels if they have been changed
- Revoke button in Applications Settings underlines on hover.
- Revoke button in Applications Settings underlines on hover.
- Add organization field to user profile
- Add organization field to user profile
...
...
app/assets/javascripts/labels_select.js
View file @
b13213e6
...
@@ -4,7 +4,7 @@
...
@@ -4,7 +4,7 @@
var
_this
;
var
_this
;
_this
=
this
;
_this
=
this
;
$
(
'
.js-label-select
'
).
each
(
function
(
i
,
dropdown
)
{
$
(
'
.js-label-select
'
).
each
(
function
(
i
,
dropdown
)
{
var
$block
,
$colorPreview
,
$dropdown
,
$form
,
$loading
,
$selectbox
,
$sidebarCollapsedValue
,
$value
,
abilityName
,
defaultLabel
,
enableLabelCreateButton
,
issueURLSplit
,
issueUpdateURL
,
labelHTMLTemplate
,
labelNoneHTMLTemplate
,
labelUrl
,
projectId
,
saveLabelData
,
selectedLabel
,
showAny
,
showNo
,
$sidebarLabelTooltip
;
var
$block
,
$colorPreview
,
$dropdown
,
$form
,
$loading
,
$selectbox
,
$sidebarCollapsedValue
,
$value
,
abilityName
,
defaultLabel
,
enableLabelCreateButton
,
issueURLSplit
,
issueUpdateURL
,
labelHTMLTemplate
,
labelNoneHTMLTemplate
,
labelUrl
,
projectId
,
saveLabelData
,
selectedLabel
,
showAny
,
showNo
,
$sidebarLabelTooltip
,
initialSelected
;
$dropdown
=
$
(
dropdown
);
$dropdown
=
$
(
dropdown
);
projectId
=
$dropdown
.
data
(
'
project-id
'
);
projectId
=
$dropdown
.
data
(
'
project-id
'
);
labelUrl
=
$dropdown
.
data
(
'
labels
'
);
labelUrl
=
$dropdown
.
data
(
'
labels
'
);
...
@@ -24,6 +24,11 @@
...
@@ -24,6 +24,11 @@
$sidebarLabelTooltip
=
$block
.
find
(
'
.js-sidebar-labels-tooltip
'
);
$sidebarLabelTooltip
=
$block
.
find
(
'
.js-sidebar-labels-tooltip
'
);
$value
=
$block
.
find
(
'
.value
'
);
$value
=
$block
.
find
(
'
.value
'
);
$loading
=
$block
.
find
(
'
.block-loading
'
).
fadeOut
();
$loading
=
$block
.
find
(
'
.block-loading
'
).
fadeOut
();
initialSelected
=
$selectbox
.
find
(
'
input[name="
'
+
$dropdown
.
data
(
'
field-name
'
)
+
'
"]
'
)
.
map
(
function
()
{
return
this
.
value
;
}).
get
();
if
(
issueUpdateURL
!=
null
)
{
if
(
issueUpdateURL
!=
null
)
{
issueURLSplit
=
issueUpdateURL
.
split
(
'
/
'
);
issueURLSplit
=
issueUpdateURL
.
split
(
'
/
'
);
}
}
...
@@ -43,6 +48,10 @@
...
@@ -43,6 +48,10 @@
selected
=
$dropdown
.
closest
(
'
.selectbox
'
).
find
(
"
input[name='
"
+
(
$dropdown
.
data
(
'
field-name
'
))
+
"
']
"
).
map
(
function
()
{
selected
=
$dropdown
.
closest
(
'
.selectbox
'
).
find
(
"
input[name='
"
+
(
$dropdown
.
data
(
'
field-name
'
))
+
"
']
"
).
map
(
function
()
{
return
this
.
value
;
return
this
.
value
;
}).
get
();
}).
get
();
if
(
_
.
isEqual
(
initialSelected
,
selected
))
return
;
initialSelected
=
selected
;
data
=
{};
data
=
{};
data
[
abilityName
]
=
{};
data
[
abilityName
]
=
{};
data
[
abilityName
].
label_ids
=
selected
;
data
[
abilityName
].
label_ids
=
selected
;
...
...
spec/features/issues_spec.rb
View file @
b13213e6
...
@@ -369,6 +369,24 @@ describe 'Issues', feature: true do
...
@@ -369,6 +369,24 @@ describe 'Issues', feature: true do
end
end
end
end
describe
'update labels from issue#show'
,
js:
true
do
let
(
:issue
)
{
create
(
:issue
,
project:
project
,
author:
@user
,
assignee:
@user
)
}
let!
(
:label
)
{
create
(
:label
,
project:
project
)
}
before
do
visit
namespace_project_issue_path
(
project
.
namespace
,
project
,
issue
)
end
it
'will not send ajax request when no data is changed'
do
page
.
within
'.labels'
do
click_link
'Edit'
first
(
'.dropdown-menu-close'
).
click
expect
(
page
).
not_to
have_selector
(
'.block-loading'
)
end
end
end
describe
'update assignee from issue#show'
do
describe
'update assignee from issue#show'
do
let
(
:issue
)
{
create
(
:issue
,
project:
project
,
author:
@user
,
assignee:
@user
)
}
let
(
:issue
)
{
create
(
:issue
,
project:
project
,
author:
@user
,
assignee:
@user
)
}
...
...
spec/javascripts/labels_issue_sidebar_spec.js.es6
View file @
b13213e6
...
@@ -48,9 +48,9 @@
...
@@ -48,9 +48,9 @@
setTimeout(() => {
setTimeout(() => {
expect($('.dropdown-content a').length).toBe(10);
expect($('.dropdown-content a').length).toBe(10);
$('.dropdow
-content a').each((i, $link) =>
{
$('.dropdow
n-content a').each(function (i)
{
if (i <
5
) {
if (i <
saveLabelCount
) {
$
link
.get(0).click();
$
(this)
.get(0).click();
}
}
});
});
...
@@ -70,9 +70,9 @@
...
@@ -70,9 +70,9 @@
setTimeout(() => {
setTimeout(() => {
expect($('.dropdown-content a').length).toBe(10);
expect($('.dropdown-content a').length).toBe(10);
$('.dropdow
-content a').each((i, $link) =>
{
$('.dropdow
n-content a').each(function (i)
{
if (i <
5
) {
if (i <
saveLabelCount
) {
$
link
.get(0).click();
$
(this)
.get(0).click();
}
}
});
});
...
@@ -86,4 +86,3 @@
...
@@ -86,4 +86,3 @@
});
});
});
});
})();
})();
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