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
764cd218
Commit
764cd218
authored
Apr 04, 2019
by
Kushal Pandya
Committed by
Jan Provaznik
Apr 05, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix labels selection, escape text in templates
parent
f8860792
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
11 additions
and
9 deletions
+11
-9
app/assets/javascripts/labels_select.js
app/assets/javascripts/labels_select.js
+11
-9
No files found.
app/assets/javascripts/labels_select.js
View file @
764cd218
...
@@ -160,7 +160,7 @@ export default class LabelsSelect {
...
@@ -160,7 +160,7 @@ export default class LabelsSelect {
* and then remove the excess ones.
* and then remove the excess ones.
*/
*/
const
toRemoveIds
=
Array
.
from
(
const
toRemoveIds
=
Array
.
from
(
$form
.
find
(
"
input[type='hidden'][name='
"
+
fieldName
+
"
']
"
),
$form
.
find
(
`input[type="hidden"][name="
${
fieldName
}
"]`
),
)
)
.
map
(
el
=>
el
.
value
)
.
map
(
el
=>
el
.
value
)
.
map
(
Number
);
.
map
(
Number
);
...
@@ -172,7 +172,8 @@ export default class LabelsSelect {
...
@@ -172,7 +172,8 @@ export default class LabelsSelect {
toRemoveIds
.
forEach
(
id
=>
{
toRemoveIds
.
forEach
(
id
=>
{
$form
$form
.
find
(
"
input[type='hidden'][name='
"
+
fieldName
+
"
'][value='
"
+
id
+
"
']
"
)
.
find
(
`input[type="hidden"][name="
${
fieldName
}
"][value="
${
id
}
"]`
)
.
last
()
.
remove
();
.
remove
();
});
});
}
}
...
@@ -518,7 +519,7 @@ export default class LabelsSelect {
...
@@ -518,7 +519,7 @@ export default class LabelsSelect {
const
labelTemplate
=
_
.
template
(
const
labelTemplate
=
_
.
template
(
[
[
'
<a href="<%- issueUpdateURL.slice(0, issueUpdateURL.lastIndexOf("/")) %>?label_name[]=<%- encodeURIComponent(label.title) %>">
'
,
'
<a href="<%- issueUpdateURL.slice(0, issueUpdateURL.lastIndexOf("/")) %>?label_name[]=<%- encodeURIComponent(label.title) %>">
'
,
'
<span class="badge label has-tooltip color-label" <%= linkAttrs %> title="<%= tooltipTitleTemplate({ label, isScopedLabel, enableScopedLabels
}) %>" style="background-color: <%- label.color %>; color: <%- label.text_color
%>;">
'
,
'
<span class="badge label has-tooltip color-label" <%= linkAttrs %> title="<%= tooltipTitleTemplate({ label, isScopedLabel, enableScopedLabels
, escapeStr }) %>" style="background-color: <%= escapeStr(label.color) %>; color: <%= escapeStr(label.text_color)
%>;">
'
,
'
<%- label.title %>
'
,
'
<%- label.title %>
'
,
'
</span>
'
,
'
</span>
'
,
'
</a>
'
,
'
</a>
'
,
...
@@ -528,7 +529,7 @@ export default class LabelsSelect {
...
@@ -528,7 +529,7 @@ export default class LabelsSelect {
const
infoIconTemplate
=
_
.
template
(
const
infoIconTemplate
=
_
.
template
(
[
[
'
<a href="<%= scopedLabelsDocumentationLink %>" class="label scoped-label" target="_blank" rel="noopener">
'
,
'
<a href="<%= scopedLabelsDocumentationLink %>" class="label scoped-label" target="_blank" rel="noopener">
'
,
'
<i class="fa fa-question-circle" style="background-color: <%
- label.color %>; color: <%- label.text_color
%>;"></i>
'
,
'
<i class="fa fa-question-circle" style="background-color: <%
= escapeStr(label.color) %>; color: <%= escapeStr(label.text_color)
%>;"></i>
'
,
'
</a>
'
,
'
</a>
'
,
].
join
(
''
),
].
join
(
''
),
);
);
...
@@ -538,9 +539,9 @@ export default class LabelsSelect {
...
@@ -538,9 +539,9 @@ export default class LabelsSelect {
'
<% if (isScopedLabel(label) && enableScopedLabels) { %>
'
,
'
<% if (isScopedLabel(label) && enableScopedLabels) { %>
'
,
"
<span class='font-weight-bold scoped-label-tooltip-title'>Scoped label</span>
"
,
"
<span class='font-weight-bold scoped-label-tooltip-title'>Scoped label</span>
"
,
'
<br />
'
,
'
<br />
'
,
'
<%
- label.description
%>
'
,
'
<%
= escapeStr(label.description)
%>
'
,
'
<% } else { %>
'
,
'
<% } else { %>
'
,
'
<%
- label.description
%>
'
,
'
<%
= escapeStr(label.description)
%>
'
,
'
<% } %>
'
,
'
<% } %>
'
,
].
join
(
''
),
].
join
(
''
),
);
);
...
@@ -552,11 +553,11 @@ export default class LabelsSelect {
...
@@ -552,11 +553,11 @@ export default class LabelsSelect {
'
<% _.each(labels, function(label){ %>
'
,
'
<% _.each(labels, function(label){ %>
'
,
'
<% if (isScopedLabel(label) && enableScopedLabels) { %>
'
,
'
<% if (isScopedLabel(label) && enableScopedLabels) { %>
'
,
'
<span class="d-inline-block position-relative scoped-label-wrapper">
'
,
'
<span class="d-inline-block position-relative scoped-label-wrapper">
'
,
'
<%= labelTemplate({ label, issueUpdateURL, isScopedLabel, enableScopedLabels, tooltipTitleTemplate, linkAttrs:
\'
data-html="true"
\'
}) %>
'
,
'
<%= labelTemplate({ label, issueUpdateURL, isScopedLabel, enableScopedLabels, tooltipTitleTemplate,
escapeStr,
linkAttrs:
\'
data-html="true"
\'
}) %>
'
,
'
<%= infoIconTemplate({ label,
scopedLabelsDocumentationLink
}) %>
'
,
'
<%= infoIconTemplate({ label,
scopedLabelsDocumentationLink, escapeStr
}) %>
'
,
'
</span>
'
,
'
</span>
'
,
'
<% } else { %>
'
,
'
<% } else { %>
'
,
'
<%= labelTemplate({ label, issueUpdateURL, isScopedLabel, enableScopedLabels, tooltipTitleTemplate, linkAttrs: "" }) %>
'
,
'
<%= labelTemplate({ label, issueUpdateURL, isScopedLabel, enableScopedLabels, tooltipTitleTemplate,
escapeStr,
linkAttrs: "" }) %>
'
,
'
<% } %>
'
,
'
<% } %>
'
,
'
<% }); %>
'
,
'
<% }); %>
'
,
].
join
(
''
),
].
join
(
''
),
...
@@ -568,6 +569,7 @@ export default class LabelsSelect {
...
@@ -568,6 +569,7 @@ export default class LabelsSelect {
infoIconTemplate
,
infoIconTemplate
,
tooltipTitleTemplate
,
tooltipTitleTemplate
,
isScopedLabel
,
isScopedLabel
,
escapeStr
:
_
.
escape
,
});
});
}
}
...
...
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