Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* story #89.

Browse Source
This commit is contained in:
wangchunsheng
2010-02-10 02:13:28 +00:00
parent 5c5c476e62
commit 63b510bbf8
3 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
trunk/module/story/lang/zh-cn.php
View File

@@ -129,5 +129,5 @@ $lang->story->duplicateStory = '重复需求';
$lang->story->reviewResult = '评审结果';
$lang->story->preVersion = '之前版本';
$lang->story->action->reviewed = array('main' => '$date, 由 <strong>$actor</strong> 评审，结果为 <strong>$extra</strong>。', 'extra' => $lang->story->reviewResultList);
$lang->story->action->reviewed = array('main' => '$date, 由 <strong>$actor</strong> 记录评审结果，结果为 <strong>$extra</strong>。', 'extra' => $lang->story->reviewResultList);
$lang->story->action->closed = array('main' => '$date, 由 <strong>$actor</strong> 关闭，原因为 <strong>$extra</strong>。', 'extra' => $lang->story->reasonList);

7
trunk/module/story/model.php
View File

@@ -108,8 +108,8 @@ class storyModel extends model
->setIF($specChanged, 'reviewedBy', '')
->setIF($specChanged, 'closedBy', '')
->setIF($specChanged, 'closedReason', '')
->setIF($specChanged and $oldStory->reviewedBy, 'reviewedDate', '')
->setIF($specChanged and $oldStory->closedBy, 'closedDate', '')
->setIF($specChanged and $oldStory->reviewedBy, 'reviewedDate', '0000-00-00')
->setIF($specChanged and $oldStory->closedBy, 'closedDate', '0000-00-00')
->remove('files,labels,spec,comment')
->get();
$this->dao->update(TABLE_STORY)
@@ -187,9 +187,10 @@ class storyModel extends model
$oldStory = $this->dao->findById($storyID)->from(TABLE_STORY)->fetch();
$now = date('Y-m-d H:i:s');
$date = date('Y-m-d');
$story = fixer::input('post')
->remove('result,preVersion,comment')
->add('reviewedDate', $now)
->setDefault('reviewedDate', $date)
->add('lastEditedBy', $this->app->user->account)
->add('lastEditedDate', $now)
->setIF($this->post->result == 'pass' and $oldStory->status == 'draft', 'status', 'active')

6
trunk/module/story/view/review.html.php
View File

@@ -72,7 +72,11 @@ function setStory(reason)
<table class='table-1'>
<caption><?php echo $story->title;?></caption>
<tr>
<th class='w-100px rowhead'><?php echo $lang->story->reviewResult;?></th>
<th class='w-100px rowhead'><?php echo $lang->story->reviewedDate;?></th>
<td><?php echo html::input('reviewedDate', date('Y-m-d'), 'class=text-3');?></td>
</tr>
<tr>
<th class='rowhead'><?php echo $lang->story->reviewResult;?></th>
<td><?php echo html::select('result', $lang->story->reviewResultList, '', 'class=select-3 onchange="switchShow(this.value)"');?></td>
</tr>
<tr id='closedReasonBox' class='hidden'>