This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "FusionForge".
The branch, master has been updated
via 4a0596d3472db0425d24af51ad2a2ec5cae831ff (commit)
via e4744a600e6cc081338448518ac73853d8f28d16 (commit)
from 7da161a3abbf0ab8579247f9c5061cdb9e383b17 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=4a0596d3472db0425d24af51ad2a2ec5cae831ff
commit 4a0596d3472db0425d24af51ad2a2ec5cae831ff
Author: Franck Villaume <franck.villa...@trivialdev.com>
Date: Thu Aug 10 15:40:21 2017 +0000
tracker artifact: support markdown syntax in summary and comments
diff --git a/src/CHANGES b/src/CHANGES
index 321aed3..f915b91 100644
--- a/src/CHANGES
+++ b/src/CHANGES
@@ -48,6 +48,7 @@ FusionForge 6.X:
* Tracker: CSV export, add comments [#853] (Dassault Aviation)
* Tracker: add new customfield: Effort (TrivialDev)
* Tracker: new widget oriented display to replace the old "2 columns" view.
(TrivialDev)
+* Tracker: support markdown syntax in artifact summary and comments
(TrivialDev)
* Utils: cross ref document/release. Use [DNNN]/[RNNN] where NNN is the ID of
the document/frs release. (TrivialDev)
* Web UI: upgrade splitter jquery plugin to 0.20.0 (TrivialDev)
* Web UI: upgrade jquery ui to 1.12.1 (TrivialDev)
diff --git a/src/common/tracker/include/ArtifactHtml.class.php
b/src/common/tracker/include/ArtifactHtml.class.php
index 3ff31f2..3e5e8ba 100644
--- a/src/common/tracker/include/ArtifactHtml.class.php
+++ b/src/common/tracker/include/ArtifactHtml.class.php
@@ -42,8 +42,15 @@ class ArtifactHtml extends Artifact {
$return = '';
$result = $this->getDetails();
$result_html = util_gen_cross_ref($result,
$this->ArtifactType->Group->getID());
- //$result = util_line_wrap( $result, 120,"\n");
- $result_html = nl2br($result_html);
+ $parsertype = forge_get_config('tracker_parser_type');
+ switch ($parsertype) {
+ case 'markdown':
+ require_once 'Michelf/Markdown.inc.php';
+ $result_html =
\Michelf\Markdown::defaultTransform($result_html);
+ break;
+ default:
+ $result_html = nl2br($result_html);
+ }
$title_arr = array();
if ($editable === true) {
@@ -108,20 +115,27 @@ function hide_edit_button(id) {
$return .= '<span style="float:left">';
$return .= _('Date')._(': ').
- date(_('Y-m-d H:i'),db_result($result,
$i, 'adddate')) .'<br />'.
+ date(_('Y-m-d H:i'), db_result($result,
$i, 'adddate')) .'<br />'.
_('Sender')._(': ');
- if(db_result($result,$i,'user_id') == 100) {
- $return .=
db_result($result,$i,'realname');
+ if(db_result($result, $i, 'user_id') == 100) {
+ $return .= db_result($result, $i,
'realname');
} else {
- $return .= util_make_link_u
(db_result($result,$i,'user_name'),db_result($result,$i,'user_id'),db_result($result,$i,'realname'));
+ $return .=
util_make_link_u(db_result($result, $i, 'user_name'), db_result($result, $i,
'user_id'), db_result($result, $i, 'realname'));
}
$return .= '</span>';
$return .= '<p style="clear: both;padding-top:
1em;">';
$text = db_result($result, $i, 'body');
$text = util_gen_cross_ref($text,
$this->ArtifactType->Group->getID());
- //$text = util_line_wrap( $text, 120,"\n");
- $text = nl2br($text);
+ $parsertype =
forge_get_config('tracker_parser_type');
+ switch ($parsertype) {
+ case 'markdown':
+ require_once
'Michelf/Markdown.inc.php';
+ $text =
\Michelf\Markdown::defaultTransform($text);
+ break;
+ default:
+ $text = nl2br($text);
+ }
$return .= $text;
$return .= '</p>';
$return .= '</td></tr>';
diff --git a/src/etc/config.ini.d/defaults.ini
b/src/etc/config.ini.d/defaults.ini
index 3c1548c..886bf82 100644
--- a/src/etc/config.ini.d/defaults.ini
+++ b/src/etc/config.ini.d/defaults.ini
@@ -97,6 +97,8 @@ use_tracker_widget_display = no
use_docman_review = no
session_expire = 3600
use_artefacts_dependencies = no
+;Uncomment the following line to use markdown syntax in tracker
+;tracker_parser_type = 'markdown'
scm_single_host = yes
system_user=fusionforge
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=e4744a600e6cc081338448518ac73853d8f28d16
commit e4744a600e6cc081338448518ac73853d8f28d16
Author: Franck Villaume <franck.villa...@trivialdev.com>
Date: Thu Aug 10 15:38:40 2017 +0000
space
diff --git a/src/common/widget/Widget_TrackerComment.class.php
b/src/common/widget/Widget_TrackerComment.class.php
index 1dd25c5..6a3b43d 100644
--- a/src/common/widget/Widget_TrackerComment.class.php
+++ b/src/common/widget/Widget_TrackerComment.class.php
@@ -60,14 +60,14 @@ class Widget_TrackerComment extends Widget {
$count = $ah->hasMessages();
$nb = $count? ' ('.$count.')' : '';
$file_list = $ah->getFiles();
- $count=count($file_list);
+ $count = count($file_list);
}
$nbf = (isset($count) && $count)? ' ('.$count.')' : '';
$elementsLi = array();
if ($func == 'detail') {
$elementsLi[] = array('content' =>
util_make_link('#tabber-comments', _('Comments').$nb, false, true));
if ($group->usesPM()) {
- $count= db_numrows($ah->getRelatedTasks());
+ $count = db_numrows($ah->getRelatedTasks());
$nbrt = $count? ' ('.$count.')' : '';
$elementsLi[] = array('content' =>
util_make_link('#tabber-tasks', _('Related Tasks').$nbrt, false, true));
}
@@ -87,11 +87,11 @@ class Widget_TrackerComment extends Widget {
if ($pluginfound) {
$elementsLi[] = array('content' =>
util_make_link('#tabber-commits', _('Commits'), false, true));
}
- $count=db_numrows($ah->getHistory());
+ $count = db_numrows($ah->getHistory());
$nbh = $count? ' ('.$count.')' : '';
$elementsLi[] = array('content' =>
util_make_link('#tabber-changes', _('Changes').$nbh, false, true));
if ($ah->hasRelations()) {
- $count=db_numrows($ah->getRelations());
+ $count = db_numrows($ah->getRelations());
$nbr = $count? ' ('.$count.')' : '';
$elementsLi[] = array('content' =>
util_make_link('#tabber-relations', _('Relations').$nbr, false, true));
}
-----------------------------------------------------------------------
Summary of changes:
src/CHANGES | 1 +
src/common/tracker/include/ArtifactHtml.class.php | 30 +++++++++++++++++------
src/common/widget/Widget_TrackerComment.class.php | 8 +++---
src/etc/config.ini.d/defaults.ini | 2 ++
4 files changed, 29 insertions(+), 12 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
Fusionforge-commits@lists.fusionforge.org
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
