fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-05-22 05:15:29 +09:00
Code Issues Projects Releases Packages Wiki Activity

이슈트래커 모듈에서 발생버전을 입력하지 않아도 되도록 수정

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/sandbox@5089 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
zero 2008-12-16 05:29:51 +00:00
parent 5a247e0125
commit 7f71e0b03f
4 changed files with 36 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

51
modules/issuetracker/issuetracker.model.php
View file

@ -46,7 +46,8 @@
return $GLOBALS['__IssueItem__'][$document_srl]; return $GLOBALS['__IssueItem__'][$document_srl];
} }
function getIssuesCount($target, $value, $status = null) { function getIssuesCount($module_srl,$target, $value, $status = null) {
$args->module_srl = $module_srl;
$args->{$target} = $value; $args->{$target} = $value;
if($status !== null) $args->status = $status; if($status !== null) $args->status = $status;
$output = executeQuery('issuetracker.getIssuesCount', $args); $output = executeQuery('issuetracker.getIssuesCount', $args);
@ -386,30 +387,32 @@
$solvedHistory = array(); $solvedHistory = array();
$output2 = executeQueryArray("issuetracker.getHistories", $args); $output2 = executeQueryArray("issuetracker.getHistories", $args);
foreach($output2->data as $history) if(count($output2->data)) {
{ foreach($output2->data as $history)
$hist = unserialize($history->history); {
$h = array(); $hist = unserialize($history->history);
if(!is_array($hist)) continue; $h = array();
$res = ""; if(!is_array($hist)) continue;
$bFirst = true; $res = "";
foreach($hist as $key => $val) { $bFirst = true;
if($bFirst) { $bFirst = false; } foreach($hist as $key => $val) {
else { $res .= "<br />"; } if($bFirst) { $bFirst = false; }
if($val[0]) $str = Context::getLang('history_format'); else { $res .= "<br />"; }
else $str = Context::getLang('history_format_not_source'); if($val[0]) $str = Context::getLang('history_format');
$str = str_replace('[source]', $val[0], $str); else $str = Context::getLang('history_format_not_source');
$str = str_replace('[target]', $val[1], $str); $str = str_replace('[source]', $val[0], $str);
$str = str_replace('[key]', Context::getLang($key), $str); $str = str_replace('[target]', $val[1], $str);
$res .= $str; $str = str_replace('[key]', Context::getLang($key), $str);
$res .= $str;
}
$obj = null;
$obj->date = $history->regdate;
$obj->type = "i";
$obj->message = $res;
$obj->target_srl = $history->target_srl;
$obj->author = $history->nick_name;
$output->data[] = $obj;
} }
$obj = null;
$obj->date = $history->regdate;
$obj->type = "i";
$obj->message = $res;
$obj->target_srl = $history->target_srl;
$obj->author = $history->nick_name;
$output->data[] = $obj;
} }
usort($output->data, _compare); usort($output->data, _compare);

14
modules/issuetracker/issuetracker.view.php
View file

@ -106,13 +106,13 @@
if($output) { if($output) {
foreach($output as $key => $milestone) { foreach($output as $key => $milestone) {
$issues = null; $issues = null;
$issues['new'] = $oIssuetrackerModel->getIssuesCount('milestone_srl', $milestone->milestone_srl,'new'); $issues['new'] = $oIssuetrackerModel->getIssuesCount($this->module_srl,'milestone_srl', $milestone->milestone_srl,'new');
$issues['reviewing'] = $oIssuetrackerModel->getIssuesCount('milestone_srl', $milestone->milestone_srl,'reviewing'); $issues['reviewing'] = $oIssuetrackerModel->getIssuesCount($this->module_srl,'milestone_srl', $milestone->milestone_srl,'reviewing');
$issues['assign'] = $oIssuetrackerModel->getIssuesCount('milestone_srl', $milestone->milestone_srl,'assign'); $issues['assign'] = $oIssuetrackerModel->getIssuesCount($this->module_srl,'milestone_srl', $milestone->milestone_srl,'assign');
$issues['resolve'] = $oIssuetrackerModel->getIssuesCount('milestone_srl', $milestone->milestone_srl,'resolve'); $issues['resolve'] = $oIssuetrackerModel->getIssuesCount($this->module_srl,'milestone_srl', $milestone->milestone_srl,'resolve');
$issues['reopen'] = $oIssuetrackerModel->getIssuesCount('milestone_srl', $milestone->milestone_srl,'reopen'); $issues['reopen'] = $oIssuetrackerModel->getIssuesCount($this->module_srl,'milestone_srl', $milestone->milestone_srl,'reopen');
$issues['postponed'] = $oIssuetrackerModel->getIssuesCount('milestone_srl', $milestone->milestone_srl,'postponed'); $issues['postponed'] = $oIssuetrackerModel->getIssuesCount($this->module_srl,'milestone_srl', $milestone->milestone_srl,'postponed');
$issues['invalid'] = $oIssuetrackerModel->getIssuesCount('milestone_srl', $milestone->milestone_srl,'invalid'); $issues['invalid'] = $oIssuetrackerModel->getIssuesCount($this->module_srl,'milestone_srl', $milestone->milestone_srl,'invalid');
$issues['total'] = $issues['new']+$issues['assign']+$issues['resolve']+$issues['reopen']+$issues['reviewing']; $issues['total'] = $issues['new']+$issues['assign']+$issues['resolve']+$issues['reopen']+$issues['reviewing'];
$milestone->issues = $issues; $milestone->issues = $issues;
$milestones[$milestone->milestone_srl] = $milestone; $milestones[$milestone->milestone_srl] = $milestone;

2
modules/issuetracker/skins/xe_issuetracker/filter/insert.xml
View file

@ -4,7 +4,7 @@
<node target="type_srl" required="true" /> <node target="type_srl" required="true" />
<node target="component_srl" required="true" /> <node target="component_srl" required="true" />
<node target="package_srl" required="true" /> <node target="package_srl" required="true" />
<node target="occured_version_srl" required="true" /> <node target="occured_version_srl" />
<node target="nick_name" required="true" /> <node target="nick_name" required="true" />
<node target="password" required="true" /> <node target="password" required="true" />
<node target="email_address" maxlength="250" /> <node target="email_address" maxlength="250" />

2
modules/issuetracker/skins/xe_issuetracker/filter/insert_history.xml
View file

@ -4,7 +4,7 @@
<node target="priority_srl" /> <node target="priority_srl" />
<node target="type_srl" required="true" /> <node target="type_srl" required="true" />
<node target="component_srl" required="true" /> <node target="component_srl" required="true" />
<node target="package_srl" required="true" /> <node target="package_srl" />
<node target="occured_version_srl" required="true" /> <node target="occured_version_srl" required="true" />
<node target="action" /> <node target="action" />
<node target="status" /> <node target="status" />