mirror of
https://github.com/Lastorder-DC/rhymix.git
synced 2026-01-14 00:39:57 +09:00
17569286 : displaying new issues in timeline
git-svn-id: http://xe-core.googlecode.com/svn/sandbox@5157 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
parent
7e7f52713e
commit
49cb4395d4
4 changed files with 27 additions and 4 deletions
|
|
@ -407,13 +407,27 @@
|
|||
}
|
||||
$obj = null;
|
||||
$obj->date = $history->regdate;
|
||||
$obj->type = "i";
|
||||
$obj->type = "changed";
|
||||
$obj->message = $res;
|
||||
$obj->target_srl = $history->target_srl;
|
||||
$obj->author = $history->nick_name;
|
||||
$output->data[] = $obj;
|
||||
}
|
||||
}
|
||||
|
||||
$output2 = executeQueryArray("issuetracker.getDocumentListForChangeset", $args);
|
||||
if(count($output2->data)) {
|
||||
foreach($output2->data as $history)
|
||||
{
|
||||
$obj = null;
|
||||
$obj->date = $history->regdate;
|
||||
$obj->type = "created";
|
||||
$obj->author = $history->nick_name;
|
||||
$obj->target_srl = $history->document_srl;
|
||||
$output->data[] = $obj;
|
||||
}
|
||||
}
|
||||
|
||||
usort($output->data, _compare);
|
||||
|
||||
return $output->data;
|
||||
|
|
|
|||
|
|
@ -77,6 +77,7 @@
|
|||
'dispIssuetrackerViewIssue' => 'View Issue',
|
||||
'dispIssuetrackerNewIssue' => 'New Issue',
|
||||
'dispIssuetrackerViewMilestone' => 'Milestone',
|
||||
'dispIssuetrackerTimeline' => 'Timeline',
|
||||
'dispIssuetrackerViewSource' => 'View Source',
|
||||
'dispIssuetrackerDownload' => 'Download',
|
||||
'dispIssuetrackerAdminProjectSetting' => 'Settings',
|
||||
|
|
@ -89,4 +90,8 @@
|
|||
$lang->cmd_document_do = 'You would...';
|
||||
$lang->not_assigned = 'Unassigned';
|
||||
$lang->not_assigned_description = 'List of unassigned issues.';
|
||||
$lang->timeline_msg = array(
|
||||
'changed' => 'changed',
|
||||
'created' => 'created'
|
||||
);
|
||||
?>
|
||||
|
|
|
|||
|
|
@ -90,4 +90,8 @@
|
|||
$lang->cmd_document_do = '이 문제를.. ';
|
||||
$lang->not_assigned = '할당 안됨';
|
||||
$lang->not_assigned_description = '할당 안된 문제들의 목록입니다.';
|
||||
$lang->timeline_msg = array(
|
||||
'changed' => '변경',
|
||||
'created' => '생성'
|
||||
);
|
||||
?>
|
||||
|
|
|
|||
|
|
@ -13,14 +13,14 @@
|
|||
<!--@end-->
|
||||
<dt class="changeset">
|
||||
<span class="time">{zdate($changeset->date,"H:i")}</span>
|
||||
<!--@if($changeset->type == "i")-->
|
||||
<!--@if($changeset->type)-->
|
||||
{@ $oIssue = $issues[$changeset->target_srl]; }
|
||||
<a href="{getUrl('','document_srl',$changeset->target_srl)}">Issue <em><!--@if($oIssue->isClosed())--><span class="closed"><!--@end-->#{$changeset->target_srl}<!--@if($oIssue->isClosed())--></span><!--@end--></em></a> ({htmlspecialchars($issues[$changeset->target_srl]->getTitleText(30))}) by <span class="author">{$changeset->author}</span>
|
||||
<a href="{getUrl('','document_srl',$changeset->target_srl)}">Issue <em><!--@if($oIssue->isClosed())--><span class="closed"><!--@end-->#{$changeset->target_srl}<!--@if($oIssue->isClosed())--></span><!--@end--></em></a> ({htmlspecialchars($issues[$changeset->target_srl]->getTitleText(30))}) {$lang->timeline_msg[$changeset->type]} by <span class="author">{$changeset->author}</span>
|
||||
<!--@else-->
|
||||
<a href="{getUrl('act','dispIssuetrackerViewSource','erev',$changeset->revision,'type','log')}">Changeset <em>[{$changeset->revision}]</em></a> by <span class="author">{$changeset->author}</span>
|
||||
<!--@end-->
|
||||
</dt>
|
||||
<dd class="changeset">
|
||||
<p><!--@if($changeset->type == "i")--><span class="status">{$changeset->message}</span><br>{$issues[$changeset->target_srl]->getContentText(80)}<!--@else-->{$changeset->message}<!--@end--></p> </dd>
|
||||
<p><!--@if($changeset->type)--><!--@if($changeset->type == "changed")--><span class="status">{$changeset->message}</span><br><!--@endif-->{$issues[$changeset->target_srl]->getContentText(80)}<!--@else-->{$changeset->message}<!--@end--></p> </dd>
|
||||
<!--@end-->
|
||||
</dl>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue