From 49cb4395d466388fd46678118ee757fec6d7448e Mon Sep 17 00:00:00 2001
From: haneul <syhan@cs.washington.edu>
Date: Mon, 22 Dec 2008 18:06:42 +0000
Subject: [PATCH] 17569286 : displaying new issues in timeline

git-svn-id: http://xe-core.googlecode.com/svn/sandbox@5157 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 modules/issuetracker/issuetracker.model.php      | 16 +++++++++++++++-
 modules/issuetracker/lang/en.lang.php            |  5 +++++
 modules/issuetracker/lang/ko.lang.php            |  4 ++++
 .../skins/xe_issuetracker/timeline.html          |  6 +++---
 4 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/modules/issuetracker/issuetracker.model.php b/modules/issuetracker/issuetracker.model.php
index 36913a7c0..5b9e0161d 100644
--- a/modules/issuetracker/issuetracker.model.php
+++ b/modules/issuetracker/issuetracker.model.php
@@ -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;
diff --git a/modules/issuetracker/lang/en.lang.php b/modules/issuetracker/lang/en.lang.php
index 4ab07c8d3..c2bf85fac 100644
--- a/modules/issuetracker/lang/en.lang.php
+++ b/modules/issuetracker/lang/en.lang.php
@@ -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'
+    );
 ?>
diff --git a/modules/issuetracker/lang/ko.lang.php b/modules/issuetracker/lang/ko.lang.php
index 5b6fb0eef..bc2f6d016 100644
--- a/modules/issuetracker/lang/ko.lang.php
+++ b/modules/issuetracker/lang/ko.lang.php
@@ -90,4 +90,8 @@
     $lang->cmd_document_do = '이 문제를.. ';
     $lang->not_assigned = '할당 안됨';
     $lang->not_assigned_description = '할당 안된 문제들의 목록입니다.';
+    $lang->timeline_msg = array(
+        'changed' => '변경',
+        'created' => '생성'
+    );
 ?>
diff --git a/modules/issuetracker/skins/xe_issuetracker/timeline.html b/modules/issuetracker/skins/xe_issuetracker/timeline.html
index 5911bf58c..753a81fe2 100644
--- a/modules/issuetracker/skins/xe_issuetracker/timeline.html
+++ b/modules/issuetracker/skins/xe_issuetracker/timeline.html
@@ -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>