mirror of
https://we.phorge.it/source/phorge.git
synced 2024-12-19 12:00:55 +01:00
Enable comments for image
Summary: Added line number 1 for each image and added code to display the comments for each image. Test Plan: Adding an image in my local directory and create a revision for it. Click line number 1, and the comment window prompts. Adding and save the comment. The comment shows in the differential comment list and in the inline comment. Submit the comment. Create more comments for the image and the "Previous" and "Next" buttons all work well. Reviewers: epriestley, jungejason CC: Differential Revision: 901
This commit is contained in:
parent
cd7ba81d83
commit
cd6eb836f6
1 changed files with 47 additions and 3 deletions
|
@ -899,22 +899,66 @@ class DifferentialChangesetParser {
|
|||
}
|
||||
}
|
||||
|
||||
$this->comments = msort($this->comments, 'getID');
|
||||
$old_comments = array();
|
||||
$new_comments = array();
|
||||
foreach ($this->comments as $comment) {
|
||||
if ($this->isCommentOnRightSideWhenDisplayed($comment)) {
|
||||
$new_comments[] = $comment;
|
||||
} else {
|
||||
$old_comments[] = $comment;
|
||||
}
|
||||
}
|
||||
|
||||
$html_old = array();
|
||||
$html_new = array();
|
||||
foreach ($old_comments as $comment) {
|
||||
$xhp = $this->renderInlineComment($comment);
|
||||
$html_old[] =
|
||||
'<tr class="inline"><th /><td>'.
|
||||
$xhp.
|
||||
'</td><th /><td /></tr>';
|
||||
}
|
||||
foreach ($new_comments as $comment) {
|
||||
$xhp = $this->renderInlineComment($comment);
|
||||
$html_new[] =
|
||||
'<tr class="inline"><th /><td /><th /><td>'.
|
||||
$xhp.
|
||||
'</td></tr>';
|
||||
}
|
||||
|
||||
$changset_id = $this->changeset->getID();
|
||||
if (!$old) {
|
||||
$th_old = '<th></th>';
|
||||
}
|
||||
else {
|
||||
$th_old = '<th id="C'.$changset_id.'OL1">1</th>';
|
||||
}
|
||||
if (!$cur) {
|
||||
$th_new = '<th></th>';
|
||||
}
|
||||
else {
|
||||
$th_new = '<th id="C'.$changset_id.'NL1">1</th>';
|
||||
}
|
||||
|
||||
$output = $this->renderChangesetTable(
|
||||
$this->changeset,
|
||||
'<tr>'.
|
||||
'<th></th>'.
|
||||
$th_old.
|
||||
'<td class="differential-old-image">'.
|
||||
'<div class="differential-image-stage">'.
|
||||
$old.
|
||||
'</div>'.
|
||||
'</td>'.
|
||||
'<th></th>'.
|
||||
$th_new.
|
||||
'<td class="differential-new-image">'.
|
||||
'<div class="differential-image-stage">'.
|
||||
$cur.
|
||||
'</div>'.
|
||||
'</td>'.
|
||||
'</tr>');
|
||||
'</tr>'.
|
||||
implode('', $html_old).
|
||||
implode('', $html_new));
|
||||
|
||||
return $output;
|
||||
case DifferentialChangeType::FILE_DIRECTORY:
|
||||
|
|
Loading…
Reference in a new issue