diff options
author | 2020-04-20 02:49:26 +0200 | |
---|---|---|
committer | 2020-04-20 02:49:26 +0200 | |
commit | afbef434b514b90a134f93ed043edd44bf564b64 (patch) | |
tree | 483124213a01ae6f101288aaffa0e9877ac98344 /web | |
parent | Make the domain configurable (diff) | |
download | glsamaker-afbef434b514b90a134f93ed043edd44bf564b64.tar.gz glsamaker-afbef434b514b90a134f93ed043edd44bf564b64.tar.bz2 glsamaker-afbef434b514b90a134f93ed043edd44bf564b64.zip |
Correctly display the user name in comments
Signed-off-by: Max Magorsch <arzano@gentoo.org>
Diffstat (limited to 'web')
-rw-r--r-- | web/packs/glsa.js | 2 | ||||
-rw-r--r-- | web/packs/src/javascript/cvetool.js | 7 | ||||
-rw-r--r-- | web/templates/dashboard/dashboard.tmpl | 2 | ||||
-rw-r--r-- | web/templates/glsa/edit.tmpl | 3 | ||||
-rw-r--r-- | web/templates/glsa/show.tmpl | 2 |
5 files changed, 7 insertions, 9 deletions
diff --git a/web/packs/glsa.js b/web/packs/glsa.js index 0490db0..8677dd7 100644 --- a/web/packs/glsa.js +++ b/web/packs/glsa.js @@ -66,7 +66,7 @@ function commentGLSA(glsaid, comment, commentType){ '<div class="row">' + '<div class="col-sm-12">' + '<span style="color:#000!important;">' + - '<span class="vcard"><a class="email" href="mailto:' + comment.User + '"> <b class="text-dark">' + comment.User + '</b></a></span>' + + '<span class="vcard"><a class="email" href="mailto:' + comment.User.Email + '"> <b class="text-dark">' + comment.User.Name + '</b></a></span>' + '</span>' + '<span class="ml-2">' + '<span class="badge badge-secondary" title="' + comment.UserBadge.Description + '" style="background: none;border: 1px solid ' + comment.UserBadge.Color + ';">' + diff --git a/web/packs/src/javascript/cvetool.js b/web/packs/src/javascript/cvetool.js index 6158714..2a04c5b 100644 --- a/web/packs/src/javascript/cvetool.js +++ b/web/packs/src/javascript/cvetool.js @@ -218,7 +218,7 @@ function format ( d ) { comments = ''; commentsObjects.forEach(function (comment, index) { var commentDate = '<small class="text-muted">' + comment.Date.split("T")[0] + ' ' + comment.Date.split("T")[1].split(".")[0] + ' UTC</small>'; - comments = comments + '<div class="col-3 text-right mb-3"><b>' + comment.User + '</b><br/>' + commentDate + '</div><div class="col-9 mb-3"><div class="card" style="background: none;"><div class="card-body">' + comment.Message + '</div></div></div>'; + comments = comments + '<div class="col-3 text-right mb-3"><b>' + comment.User.Name + '</b><br/>' + commentDate + '</div><div class="col-9 mb-3"><div class="card" style="background: none;"><div class="card-body">' + comment.Message + '</div></div></div>'; }); } @@ -315,9 +315,6 @@ function registerCommentListener(){ $( ".save-new-comment" ).click(function() { var cveid = $(this).data( "cveid" ); var comment = $('textarea.new-comment[data-cveid="' + cveid + '"]').val(); - console.log('textarea:'); - console.log(); - $.post( '/cve/comment/add', @@ -332,7 +329,7 @@ function registerCommentListener(){ console.log(data); var comment = JSON.parse(data); var commentDate = '<small class="text-muted">' + comment.Date.split("T")[0] + ' ' + comment.Date.split("T")[1].split(".")[0] + ' UTC</small>'; - var newComment = '<div class="col-3 text-right mb-3"><b>' + comment.User + '</b><br/>' + commentDate + '</div><div class="col-9 mb-3"><div class="card" style="background: none;"><div class="card-body">' + comment.Message + '</div></div></div>'; + var newComment = '<div class="col-3 text-right mb-3"><b>' + comment.User.Name + '</b><br/>' + commentDate + '</div><div class="col-9 mb-3"><div class="card" style="background: none;"><div class="card-body">' + comment.Message + '</div></div></div>'; $('.comments-section[data-cveid="' + cveid + '"]').append(newComment); } return diff --git a/web/templates/dashboard/dashboard.tmpl b/web/templates/dashboard/dashboard.tmpl index d77fd73..b6d3d2c 100644 --- a/web/templates/dashboard/dashboard.tmpl +++ b/web/templates/dashboard/dashboard.tmpl @@ -87,7 +87,7 @@ <a href="{{if .GlsaId}}/glsa/{{.GlsaId}}{{end}}">{{.Message}}</a> </td> <td class="text-right"> - {{.User}} + {{.User.Name}} </td> <td class="text-right"> {{.Date}} diff --git a/web/templates/glsa/edit.tmpl b/web/templates/glsa/edit.tmpl index 4318d86..eed5c44 100644 --- a/web/templates/glsa/edit.tmpl +++ b/web/templates/glsa/edit.tmpl @@ -679,7 +679,7 @@ <div class="row"> <div class="col-sm-12"> <span style="color:#000!important;"> - <span class="vcard"><a class="email" href="mailto:max@magorsch.de" title="Max Magorsch <max@magorsch.de>"> <b class="text-dark">{{.User}}</b></a></span> + <span class="vcard"><a class="email" href="mailto:{{.User.Email}}" title="{{.User.Name}} <{{.User.Email}}>"> <b class="text-dark">{{.User.Name}}</b></a></span> </span> <span class="ml-2"> @@ -731,6 +731,7 @@ </div> <textarea name="comment" id="comment" class="form-control comment-textarea" rows="10" cols="60" onfocusout="this.rows=10" onfocus="this.rows=15"></textarea> <br><div class="knob-buttons"> + <input class="btn btn-outline-primary btn-sm float-right" type="button" value="Add Comment" id="save-new-glsa-comment"> {{if .User.Permissions.Glsa.Approve}} {{if eq .Glsa.CreatorId .User.Id}} {{if .User.Permissions.Glsa.ApproveOwnGlsa}} diff --git a/web/templates/glsa/show.tmpl b/web/templates/glsa/show.tmpl index c9a9591..a07d471 100644 --- a/web/templates/glsa/show.tmpl +++ b/web/templates/glsa/show.tmpl @@ -412,7 +412,7 @@ <div class="row"> <div class="col-sm-12"> <span style="color:#000!important;"> - <span class="vcard"><a class="email" href="mailto:max@magorsch.de" title="Max Magorsch <max@magorsch.de>"> <b class="text-dark">{{.User}}</b></a></span> + <span class="vcard"><a class="email" href="mailto:{{.User.Email}}" title="{{.User.Name}} <{{.User.Email}}>"> <b class="text-dark">{{.User.Name}}</b></a></span> </span> <span class="ml-2"> |