Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
C
core
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Requirements
External wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
minerva
core
Commits
e725c5f1
Commit
e725c5f1
authored
5 years ago
by
Piotr Gawron
Browse files
Options
Downloads
Patches
Plain Diff
link to comment from admin panel was broken
parent
e67888fa
No related branches found
No related tags found
1 merge request
!939
Resolve "comment hyperlink not working"
Pipeline
#13955
passed
5 years ago
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
CHANGELOG
+1
-0
1 addition, 0 deletions
CHANGELOG
frontend-js/src/main/js/gui/admin/CommentsAdminPanel.js
+3
-3
3 additions, 3 deletions
frontend-js/src/main/js/gui/admin/CommentsAdminPanel.js
with
4 additions
and
3 deletions
CHANGELOG
+
1
−
0
View file @
e725c5f1
...
@@ -11,6 +11,7 @@ minerva (14.0.0~beta.2) unstable; urgency=low
...
@@ -11,6 +11,7 @@ minerva (14.0.0~beta.2) unstable; urgency=low
* Bug fix: information about deprecated column is more clear about column
* Bug fix: information about deprecated column is more clear about column
names (#838)
names (#838)
* Bug fix: version of the project is limited to 20 characters (#951)
* Bug fix: version of the project is limited to 20 characters (#951)
* Bug fix: link to comment on map from admin panel was broken (#941)
-- Piotr Gawron <piotr.gawron@uni.lu> Mon, 16 Sep 2019 21:00:00 +0200
-- Piotr Gawron <piotr.gawron@uni.lu> Mon, 16 Sep 2019 21:00:00 +0200
...
...
This diff is collapsed.
Click to expand it.
frontend-js/src/main/js/gui/admin/CommentsAdminPanel.js
+
3
−
3
View file @
e725c5f1
...
@@ -153,9 +153,9 @@ CommentsAdminPanel.prototype.commentToTableRow = function (comment, disable) {
...
@@ -153,9 +153,9 @@ CommentsAdminPanel.prototype.commentToTableRow = function (comment, disable) {
"
&y=
"
+
comment
.
getCoordinates
().
y
+
"
&y=
"
+
comment
.
getCoordinates
().
y
+
"
&zoom=12
"
+
"
&zoom=12
"
+
"
&comments=on
"
;
"
&comments=on
"
;
title
=
"
<a href='
"
+
commentLink
+
"
' target='
"
+
projectId
+
"
'>
"
+
comment
.
getTitle
()
+
"
</a>
"
;
title
=
"
<a href='
"
+
commentLink
+
"
' target='
"
+
projectId
+
"
'>
"
+
xss
(
comment
.
getTitle
()
)
+
"
</a>
"
;
}
else
{
}
else
{
title
=
comment
.
getTitle
();
title
=
xss
(
comment
.
getTitle
()
)
;
}
}
var
disabled
=
""
;
var
disabled
=
""
;
...
@@ -180,7 +180,7 @@ CommentsAdminPanel.prototype.commentToTableRow = function (comment, disable) {
...
@@ -180,7 +180,7 @@ CommentsAdminPanel.prototype.commentToTableRow = function (comment, disable) {
}
}
return
[
comment
.
getId
(),
return
[
comment
.
getId
(),
xss
(
title
)
,
title
,
xss
(
author
),
xss
(
author
),
xss
(
email
),
xss
(
email
),
xss
(
comment
.
getContent
()),
xss
(
comment
.
getContent
()),
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment