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

Merge branch 'zentaopms_9.8' of https://github.com/easysoft/zentaopms into zentaopms_9.8

Browse Source
This commit is contained in:
daitingting
2018-03-21 13:45:31 +08:00
parent 3dd4a4e97b 0fb63f3814
commit a0aa9f6d6e
5 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
db/zentao.sql
+1 -1
View File
@@ -773,7 +773,7 @@ CREATE TABLE IF NOT EXISTS `zt_user` (
`account` char(30) NOT NULL default '',
`password` char(32) NOT NULL default '',
`role` char(10) NOT NULL default '',
`realname` char(30) NOT NULL default '',
`realname` char(100) NOT NULL default '',
`nickname` char(60) NOT NULL default '',
`commiter` varchar(100) NOT NULL,
`avatar` char(30) NOT NULL default '',
module/action/model.php
+1 -1
View File
@@ -32,7 +32,7 @@ class actionModel extends model
*/
public function create($objectType, $objectID, $actionType, $comment = '', $extra = '', $actor = '', $autoDelete = true)
{
if(empty($comment)) return false;
if($actionType == 'commented' and empty($comment)) return false;
$actor = $actor ? $actor : $this->app->user->account;
$actionType = strtolower($actionType);
if($actor == 'guest' and $actionType == 'logout') return false;
module/build/control.php
+10 -1
View File
@@ -353,7 +353,16 @@ class build extends control
{
$builds = $this->build->getProjectBuildPairs($projectID, $productID, $branch, 'noempty,notrunk');
if($isJsonView) die(json_encode($builds));
else die(html::select('build', $builds, $build, "class='form-control'"));
else
{
if(empty($builds))
{
echo html::a($this->createLink('build', 'create', "projectID=$projectID "), $this->lang->build->create, '_blank');
echo '  ';
echo html::a("javascript:loadProjectBuilds($projectID)", $this->lang->refresh);
}
die(html::select('build', $builds, $build, "class='form-control'"));
}
}
}
module/doc/model.php
+2 -2
View File
@@ -696,11 +696,11 @@ class docModel extends model
if($type == 'product' or $type == 'project')
{
$table = $type == 'product' ? TABLE_PRODUCT : TABLE_PROJECT;
$libs = $this->dao->select('id,name,`order`')->from($table)->where('id')->in($idList)->page($pager, 'id')->orderBy('`order` desc, id desc')->fetchAll('id');
$libs = $this->dao->select('id,name,`order`')->from($table)->where('id')->in($idList)->orderBy('`order` desc, id desc')->page($pager, 'id')->fetchAll('id');
}
else
{
$libs = $this->dao->select('id,name')->from(TABLE_DOCLIB)->where('id')->in($idList)->page($pager, 'id')->orderBy('`order`, id desc')->fetchAll('id');
$libs = $this->dao->select('id,name')->from(TABLE_DOCLIB)->where('id')->in($idList)->orderBy('`order`, id desc')->page($pager, 'id')->fetchAll('id');
}
return $libs;
module/productplan/view/browse.html.php
+6 -3
View File
@@ -44,7 +44,7 @@
<?php $vars = "productID=$productID&branch=$branch&browseType=$browseType&orderBy=%s&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}"; ?>
<tr class='colhead'>
<th class='w-id'> <?php common::printOrderLink('id', $orderBy, $vars, $lang->idAB);?></th>
<th> <?php common::printOrderLink('title', $orderBy, $vars, $lang->productplan->title);?></th>
<th class='w-p10'> <?php common::printOrderLink('title', $orderBy, $vars, $lang->productplan->title);?></th>
<?php if($this->session->currentProductType != 'normal'):?>
<th class='w-100px'><?php common::printOrderLink('branch',$orderBy, $vars, $lang->product->branch);?></th>
<?php endif;?>
@@ -54,8 +54,8 @@
<th class='w-60px'> <?php echo $lang->productplan->bugs;?></th>
<th class='w-60px'> <?php echo $lang->productplan->hour;?></th>
<th class='w-60px'> <?php echo $lang->productplan->project;?></th>
<th class='w-p40'> <?php echo $lang->productplan->desc;?></th>
<th class="w-130px {sorter: false}"><?php echo $lang->actions;?></th>
<th class='w-p20'> <?php echo $lang->productplan->desc;?></th>
<th class="w-150px {sorter: false}"><?php echo $lang->actions;?></th>
</tr>
</thead>
<tbody>
@@ -99,8 +99,11 @@
<tr>
<td colspan='<?php echo $this->session->currentProductType == 'normal' ? '10' : '11';?>'>
<div class='table-actions clearfix'>
<?php if(empty($plan)):?>
<?php else:?>
<?php echo html::selectButton();?>
<?php if(common::hasPriv('productplan', 'batchEdit')) echo html::submitButton($lang->edit);?>
<?php endif;?>
</div>
<?php $pager->show();?>
</td>