From 8c5ba3b6d87b115b1a3e0a272cdb3a73f6847f1d Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: Dec 18 2017 09:44:40 +0000 Subject: Make the milestone clickable Both when loading the issue page and when the milestone is added via the SSE. Fixes https://pagure.io/pagure/issue/2855 Signed-off-by: Pierre-Yves Chibon --- diff --git a/pagure/static/issue_ev.js b/pagure/static/issue_ev.js index 286bb48..53ec345 100644 --- a/pagure/static/issue_ev.js +++ b/pagure/static/issue_ev.js @@ -205,7 +205,7 @@ update_comment = function(data) { field.find('.issue_comment').show(); } -update_issue = function(data) { +update_issue = function(data, _roadmap_url) { console.log('Adjusting issue ' + data.fields); for (i=0; i' + data.issue.content + '

'); } else if (_f == 'milestone'){ var field = $('#milestone_plain'); - field.html(data.issue.milestone) + var _url = _roadmap_url.replace('-123456789', data.issue.milestone); + field.html( + '' + data.issue.milestone + '') } } } @@ -329,7 +331,8 @@ private_issue_update = function(data, _api_issue_url, issue_uid) { } process_event = function( - data, issue_uid, _issue_url, _issues_url, _api_issue_url, username) + data, issue_uid, _issue_url, _issues_url, _api_issue_url, + _roadmap_url, username) { console.log(data); var category = null; @@ -379,7 +382,7 @@ process_event = function( category = 'Custom fields edited'; } else if (data.fields){ - update_issue(data); + update_issue(data, _roadmap_url); category = 'Issue edited'; } else { console.log('Unknown data'); diff --git a/pagure/templates/issue.html b/pagure/templates/issue.html index 2fb1d90..81059a0 100644 --- a/pagure/templates/issue.html +++ b/pagure/templates/issue.html @@ -291,7 +291,16 @@
{% if issue.milestone %} - {{ issue.milestone }} + + + {{ issue.milestone }} + + {% endif %}
@@ -665,8 +674,14 @@ source.addEventListener('message', function(e) { username=username, namespace=repo.namespace, issueid='-123456789')}}'; + var _roadmap_url ='{{ + url_for('view_roadmap', + repo=repo.name, + username=username, + namespace=repo.namespace, + milestone='-123456789')}}'; process_event(data, "{{ issue.uid }}", _issue_url, - _issues_url, _api_issues_url, + _issues_url, _api_issues_url, _roadmap_url, "{{ g.fas_user.username if authenticated or '' }}"); setup_edit_btns(); setup_reply_btns();