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

Merge branch 'master' of https://github.com/easysoft/zentaopms

Browse Source
This commit is contained in:
tengfei
2017-12-20 16:13:58 +08:00
parent 117096919d 6b3ed58d8b
commit 7df4d8febf
46 changed files with 751 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/bug/control.php
+2 -2
View File
@@ -960,7 +960,7 @@ class bug extends control
$this->view->users = $users;
$this->view->assignedTo = $assignedTo;
$this->view->projects = $this->loadModel('product')->getProjectPairs($productID, $bug->branch ? "0,{$bug->branch}" : 0, $params = 'nodeleted');
$this->view->builds = $this->loadModel('build')->getProductBuildPairs($productID, $branch = 0, 'all');
$this->view->builds = $this->loadModel('build')->getProductBuildPairs($productID, $branch = 0, 'all', true , $bug->project);
$this->view->actions = $this->action->getList('bug', $bugID);
$this->display();
}
@@ -1018,7 +1018,7 @@ class bug extends control
$this->view->bug = $bug;
$this->view->users = $this->user->getPairs('nodeleted', $bug->resolvedBy);
$this->view->builds = $this->loadModel('build')->getProductBuildPairs($productID, $bug->branch, 'noempty');
$this->view->builds = $this->loadModel('build')->getProductBuildPairs($productID, $bug->branch, 'noempty', true, $bug->project);
$this->view->actions = $this->action->getList('bug', $bugID);
$this->display();
module/bug/js/batchcreate.js
+24
View File
@@ -136,3 +136,27 @@ if(navigator.userAgent.indexOf("Firefox") < 0)
this.style.height = (this.scrollHeight + 2) + "px";
});
}
$(document).keydown(function(event)
{
if(event.ctrlKey && event.keyCode == 38)
{
event.stopPropagation();
event.preventDefault();
selectFocusJump('up');
}
else if(event.ctrlKey && event.keyCode == 40)
{
event.stopPropagation();
event.preventDefault();
selectFocusJump('down');
}
else if(event.keyCode == 38)
{
inputFocusJump('up');
}
else if(event.keyCode == 40)
{
inputFocusJump('down');
}
});
module/bug/model.php
+11 -2
View File
@@ -511,6 +511,7 @@ class bugModel extends model
->setDefault('openedBuild', '')
->setDefault('plan', 0)
->setDefault('deadline', '0000-00-00')
->setDefault('resolvedDate', '0000-00-00 00:00:00')
->setIF(strpos($this->config->bug->edit->requiredFields, 'deadline') !== false, 'deadline', $this->post->deadline)
->add('lastEditedBy', $this->app->user->account)
->add('lastEditedDate', $now)
@@ -2413,10 +2414,18 @@ class bugModel extends model
echo zget($plans, $bug->plan, '');
break;
case 'story':
echo zget($stories, $bug->story, '');
if(isset($stories[$bug->story]))
{
$story = $stories[$bug->story];
echo common::hasPriv('story', 'view') ? html::a(helper::createLink('story', 'view', "storyID=$story->id", 'html', true), $story->title, '', "class='iframe'") : $story->title;
}
break;
case 'task':
echo zget($tasks, $bug->task, '');
if(isset($tasks[$bug->task]))
{
$task = $tasks[$bug->task];
echo common::hasPriv('task', 'view') ? html::a(helper::createLink('task', 'view', "taskID=$task->id", 'html', true), $task->name, '', "class='iframe'") : $task->name;
}
break;
case 'type':
echo zget($this->lang->bug->typeList, $bug->type);
module/bug/view/edit.html.php
+2 -2
View File
@@ -211,7 +211,7 @@ js::set('oldResolvedBuild' , $bug->resolvedBuild);
</tr>
<tr>
<th><?php echo $lang->bug->resolvedDate;?></th>
<td><?php echo html::input('resolvedDate', $bug->resolvedDate, 'class=form-control');?></td>
<td><?php echo html::input('resolvedDate', $bug->resolvedDate, "class='form-control form-datetime'");?></td>
</tr>
<tr>
<th><?php echo $lang->bug->resolvedBuild;?></th>
@@ -236,7 +236,7 @@ js::set('oldResolvedBuild' , $bug->resolvedBuild);
</tr>
<tr>
<th><?php echo $lang->bug->closedDate;?></th>
<td><?php echo html::input('closedDate', $bug->closedDate, 'class=form-control');?></td>
<td><?php echo html::input('closedDate', $bug->closedDate, "class='form-control form-datetime'");?></td>
</tr>
</table>
</fieldset>