+ add resolvedDate of bug.
+ add finishedDate of task.
This commit is contained in:
@@ -531,7 +531,6 @@ class bug extends control
|
||||
public function resolve($bugID)
|
||||
{
|
||||
$this->view->users = $this->user->getPairs('nodeleted');
|
||||
|
||||
if(!empty($_POST))
|
||||
{
|
||||
$this->bug->resolve($bugID);
|
||||
@@ -556,6 +555,7 @@ class bug extends control
|
||||
$this->view->header['title'] = $this->products[$productID] . $this->lang->colon . $this->lang->bug->resolve;
|
||||
$this->view->position[] = html::a($this->createLink('bug', 'browse', "productID=$productID"), $this->products[$productID]);
|
||||
$this->view->position[] = $this->lang->bug->resolve;
|
||||
$this->view->date = strftime("%Y-%m-%d %X", strtotime('now'));
|
||||
|
||||
$this->view->bug = $bug;
|
||||
$this->view->builds = $this->loadModel('build')->getProductBuildPairs($productID);
|
||||
|
||||
@@ -243,8 +243,9 @@ class bugModel extends model
|
||||
*/
|
||||
public function resolve($bugID)
|
||||
{
|
||||
$now = helper::now();
|
||||
$bug = fixer::input('post')
|
||||
$now = helper::now();
|
||||
$oldBug = $this->getById($bugID);
|
||||
$bug = fixer::input('post')
|
||||
->add('resolvedBy', $this->app->user->account)
|
||||
->add('resolvedDate', $now)
|
||||
->add('status', 'resolved')
|
||||
|
||||
@@ -26,6 +26,10 @@
|
||||
<td class='rowhead'><?php echo $lang->bug->resolvedBuild;?></td>
|
||||
<td><?php echo html::select('resolvedBuild', $builds, '', 'class=select-3');?></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class='rowhead'><?php echo $lang->bug->resolvedDate;?></td>
|
||||
<td><?php echo html::input('resolvedDate',$date, "class='select-3'");?></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class='rowhead'><?php echo $lang->bug->assignedTo;?></td>
|
||||
<td><?php echo html::select('assignedTo', $users, $bug->openedBy, 'class=select-3');?></td>
|
||||
|
||||
@@ -444,7 +444,8 @@ class task extends control
|
||||
|
||||
$this->view->header->title = $this->view->project->name . $this->lang->colon .$this->lang->task->finish;
|
||||
$this->view->position[] = $this->lang->task->finish;
|
||||
|
||||
$this->view->date = strftime("%Y-%m-%d %X", strtotime('now'));
|
||||
|
||||
$this->display();
|
||||
}
|
||||
|
||||
|
||||
@@ -17,7 +17,12 @@
|
||||
<tr>
|
||||
<th class='rowhead'><?php echo $lang->task->consumed;?></th>
|
||||
<td><?php echo html::input('consumed', $task->consumed, "class='text-3'") . $lang->task->hour;?></td>
|
||||
</tr>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class='rowhead'><?php echo $lang->task->finishedDate;?></td>
|
||||
<td><?php echo html::input('finishedDate',$date, "class='select-3'");?></td>
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
<td class='rowhead'><?php echo $lang->comment;?></td>
|
||||
<td><?php echo html::textarea('comment', '', "rows='6' class='area-1'");?></td>
|
||||
|
||||
Reference in New Issue
Block a user