fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-17 10:19:55 +09:00
Code Issues Projects Releases Packages Wiki Activity

issuetracker * 댓글에 에디터 붙임

Browse source 
* 첨부파일 목록 표시 미구현
  * 첨부파일 활성화 트리거 추가
  * 첨부파일 수 기록 필드 추가

file * 첨부파일 목록에서 업로드 타겟을 알 수 없을 경우
       무조건 '대기'로 타이틀을 표시하는 문제 수정

git-svn-id: http://xe-core.googlecode.com/svn/sandbox@6512 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
bnu 2009-06-11 01:32:17 +00:00
parent 0fbf4934eb
commit d0ed1a982d
7 changed files with 81 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

29
modules/issuetracker/issuetracker.controller.php
View file

@ -64,11 +64,11 @@
// 그렇지 않으면 신규 등록
} else {
// assignee name
$oMemberModel = &getModel('member');
// assignee name
$oMemberModel = &getModel('member');
$member_info = $oMemberModel->getMemberInfoByMemberSrl($obj->assignee_srl);
$obj->assignee_name = $member_info->nick_name;
// transaction start
$oDB = &DB::getInstance();
$oDB->begin();
@ -148,7 +148,7 @@
if(!$output->toBool()) return $output;
$output = executeQuery('issuetracker.deleteHistories', $args);
return $output;
return $output;
}
function insertHistory($target_srl, $objs, $module_srl, $grant)
@ -156,12 +156,19 @@
$oIssuetrackerModel = &getModel('issuetracker');
$oIssue = $oIssuetrackerModel->getIssue($target_srl);
if(!$oIssue->isExists()) return new Object(-1,'msg_not_founded');
$objs->comment_srl = Context::get('history_srl');
// trigger 호출 (before)
$output = ModuleHandler::triggerCall('issuetracker.insertHistory', 'before', $objs);
if(!$output->toBool()) return $output;
$logged_info = Context::get('logged_info');
$args = null;
// 글작성시 필요한 변수를 세팅
$args->history_srl = $args->comment_srl = $objs->comment_srl;
$args->uploaded_count = $objs->uploaded_count;
$args->target_srl = $target_srl;
$args->content = Context::get('content');
if($logged_info->member_srl) {
@ -348,9 +355,14 @@
$args->history = serialize($history);
}
}
$args->issues_history_srl = getNextSequence();
$args->issues_history_srl = ($args->history_srl) ? $args->history_srl : getNextSequence();
$args->module_srl = $module_srl;
// trigger 호출 (before)
$output = ModuleHandler::triggerCall('issuetracker.insertHistory', 'after', $args);
if(!$output->toBool()) return $output;
$output = executeQueryArray('issuetracker.insertHistory', $args);
if(!$output->toBool()) return $output;
@ -358,6 +370,7 @@
$cnt = $oIssuetrackerModel->getHistoryCount($target_srl);
$oDocumentController = &getController('document');
$oDocumentController->updateCommentCount($target_srl, $cnt, $logged_info->member_srl);
return new Object();
}
@ -367,7 +380,7 @@
// 원 이슈를 가져옴
$target_srl = Context::get('target_srl');
$args = Context::gets('milestone_srl', 'priority_srl', 'type_srl', 'component_srl', 'package_srl', 'occured_version_srl', 'action', 'status', 'assignee_srl');
$args = Context::gets('milestone_srl', 'priority_srl', 'type_srl', 'component_srl', 'package_srl', 'occured_version_srl', 'action', 'status', 'assignee_srl');
$output = $this->insertHistory($target_srl, $args, $this->module_srl, $this->grant->commiter);
if(!$output->toBool())
{
@ -436,7 +449,7 @@
$oController = &getController('issuetracker');
while($latestRevision < $status->revision)
{
$gap = $status->revision-$latestRevision;
$gap = $status->revision-$latestRevision;
if($gap > 500) $gap = 500;
$logs = $oSvn->getLog("/", $latestRevision+1, $status->revision, false, $gap, false);
foreach($logs as $log)
@ -444,7 +457,7 @@
$obj = null;
$obj->revision = $log->revision;
$obj->author = $log->author;
$obj->date = date("YmdHis", strtotime($log->date));
$obj->date = date("YmdHis", strtotime($log->date));
$obj->message = trim($log->msg);
$obj->module_srl = $module_info->module_srl;
executeQuery("issuetracker.insertChangeset", $obj);