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
Jérome Perrin
gitlab-ce
Commits
0158b86d
Commit
0158b86d
authored
Apr 26, 2016
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Updated label links to work correctly for filtering
See !3846#note_5033951
parent
6ff740ff
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
6 deletions
+6
-6
app/assets/javascripts/labels_select.js.coffee
app/assets/javascripts/labels_select.js.coffee
+1
-1
app/helpers/labels_helper.rb
app/helpers/labels_helper.rb
+1
-1
spec/helpers/labels_helper_spec.rb
spec/helpers/labels_helper_spec.rb
+4
-4
No files found.
app/assets/javascripts/labels_select.js.coffee
View file @
0158b86d
...
...
@@ -30,7 +30,7 @@ class @LabelsSelect
if
issueUpdateURL
labelHTMLTemplate
=
_
.
template
(
'<% _.each(labels, function(label){ %>
<a href="<%= ["",issueURLSplit[1], issueURLSplit[2],""].join("/") %>issues?label_name=<%= _.escape(label.title) %>">
<a href="<%= ["",issueURLSplit[1], issueURLSplit[2],""].join("/") %>issues?label_name
[]
=<%= _.escape(label.title) %>">
<span class="label has-tooltip color-label" title="<%= _.escape(label.description) %>" style="background-color: <%= label.color %>; color: <%= label.text_color %>;">
<%= _.escape(label.title) %>
</span>
...
...
app/helpers/labels_helper.rb
View file @
0158b86d
...
...
@@ -37,7 +37,7 @@ module LabelsHelper
link
=
send
(
"namespace_project_
#{
type
.
to_s
.
pluralize
}
_path"
,
project
.
namespace
,
project
,
label_name:
label
.
name
)
label_name:
[
label
.
name
]
)
if
block_given?
link_to
link
,
&
block
...
...
spec/helpers/labels_helper_spec.rb
View file @
0158b86d
...
...
@@ -11,13 +11,13 @@ describe LabelsHelper do
end
it
'uses the instance variable'
do
expect
(
link_to_label
(
label
)).
to
match
%r{<a href="/
#{
@project
.
to_reference
}
/issues
\?
label_name=
#{
label
.
name
}
"><span class="[
\w\s\-
]*has-tooltip".*</span></a>}
expect
(
link_to_label
(
label
)).
to
match
%r{<a href="/
#{
@project
.
to_reference
}
/issues
\?
label_name
%5B%5D
=
#{
label
.
name
}
"><span class="[
\w\s\-
]*has-tooltip".*</span></a>}
end
end
context
'without @project set'
do
it
"uses the label's project"
do
expect
(
link_to_label
(
label
)).
to
match
%r{<a href="/
#{
label
.
project
.
to_reference
}
/issues
\?
label_name=
#{
label
.
name
}
">.*</a>}
expect
(
link_to_label
(
label
)).
to
match
%r{<a href="/
#{
label
.
project
.
to_reference
}
/issues
\?
label_name
%5B%5D
=
#{
label
.
name
}
">.*</a>}
end
end
...
...
@@ -25,7 +25,7 @@ describe LabelsHelper do
let
(
:another_project
)
{
double
(
'project'
,
namespace:
'foo3'
,
to_param:
'bar3'
)
}
it
'links to merge requests page'
do
expect
(
link_to_label
(
label
,
project:
another_project
)).
to
match
%r{<a href="/foo3/bar3/issues
\?
label_name=
#{
label
.
name
}
">.*</a>}
expect
(
link_to_label
(
label
,
project:
another_project
)).
to
match
%r{<a href="/foo3/bar3/issues
\?
label_name
%5B%5D
=
#{
label
.
name
}
">.*</a>}
end
end
...
...
@@ -33,7 +33,7 @@ describe LabelsHelper do
[
'issue'
,
:issue
,
'merge_request'
,
:merge_request
].
each
do
|
type
|
context
"set to
#{
type
}
"
do
it
'links to correct page'
do
expect
(
link_to_label
(
label
,
type:
type
)).
to
match
%r{<a href="/
#{
label
.
project
.
to_reference
}
/
#{
type
.
to_s
.
pluralize
}
\?
label_name=
#{
label
.
name
}
">.*</a>}
expect
(
link_to_label
(
label
,
type:
type
)).
to
match
%r{<a href="/
#{
label
.
project
.
to_reference
}
/
#{
type
.
to_s
.
pluralize
}
\?
label_name
%5B%5D
=
#{
label
.
name
}
">.*</a>}
end
end
end
...
...
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