natalie
/
indefero
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed issue 217, can't link directly to a user comment when linking to an issue

master
Baptiste Durand-Bret 2009-06-19 16:01:17 +02:00 committed by Loic d'Anterroches
parent a15107558c
commit 29e053bf6b
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/IDF/Template/IssueComment.php
View File

@ -44,7 +44,7 @@ class IDF_Template_IssueComment extends Pluf_Template_Tag
'<a href="\1">\1</a>', $text); '<a href="\1">\1</a>', $text);
} }
if ($request->rights['hasIssuesAccess']) { if ($request->rights['hasIssuesAccess']) {
$text = preg_replace_callback('#(issues?|bugs?|tickets?)\s+(\d+)((\s+and|\s+or|,)\s+(\d+)){0,}#im', $text = preg_replace_callback('#(issues?|bugs?|tickets?)\s+(\d+)(\#ic\d*){0,1}((\s+and|\s+or|,)\s+(\d+)(\#ic\d*){0,1}){0,}#im',
array($this, 'callbackIssues'), $text); array($this, 'callbackIssues'), $text);
} }
if ($request->rights['hasSourceAccess']) { if ($request->rights['hasSourceAccess']) {
@ -66,10 +66,14 @@ class IDF_Template_IssueComment extends Pluf_Template_Tag
*/ */
function callbackIssues($m) function callbackIssues($m)
{ {
if (count($m) == 3) { if (count($m) == 3 || count($m) == 4) {
$issue = new IDF_Issue($m[2]); $issue = new IDF_Issue($m[2]);
if ($issue->id > 0 and $issue->project == $this->project->id) { if ($issue->id > 0 and $issue->project == $this->project->id) {
return $this->linkIssue($issue, $m[1].' '.$m[2]); if (count($m) == 3) {
return $this->linkIssue($issue, $m[1].' '.$m[2]);
} else {
return $this->linkIssue($issue, $m[1].' '.$m[2], $m[3]);
}
} else { } else {
return $m[0]; // not existing issue. return $m[0]; // not existing issue.
} }
@ -156,10 +160,10 @@ class IDF_Template_IssueComment extends Pluf_Template_Tag
* @param string Name of the link. * @param string Name of the link.
* @return string Linked issue. * @return string Linked issue.
*/ */
public function linkIssue($issue, $title) public function linkIssue($issue, $title, $anchor='')
{ {
$ic = (in_array($issue->status, $this->project->getTagIdsByStatus('closed'))) ? 'issue-c' : 'issue-o'; $ic = (in_array($issue->status, $this->project->getTagIdsByStatus('closed'))) ? 'issue-c' : 'issue-o';
return '<a href="'.Pluf_HTTP_URL_urlForView('IDF_Views_Issue::view', return '<a href="'.Pluf_HTTP_URL_urlForView('IDF_Views_Issue::view',
array($this->project->shortname, $issue->id)).'" class="'.$ic.'" title="'.Pluf_esc($issue->summary).'">'.Pluf_esc($title).'</a>'; array($this->project->shortname, $issue->id)).$anchor.'" class="'.$ic.'" title="'.Pluf_esc($issue->summary).'">'.Pluf_esc($title).'</a>';
} }
} }