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

Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3

Browse Source
This commit is contained in:
tianshujie98
2021-03-30 14:40:49 +08:00
parent eb2b7f533b 7380a7af8c
commit e3d91cccfa
9 changed files with 37 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/my/view/doc.html.php
+1 -1
View File
@@ -60,7 +60,7 @@
<?php if(common::hasPriv('doc', 'collect')):?>
<a data-url="<?php echo $this->createLink('doc', 'collect', "objectID=$doc->id&objectType=doc");?>" title="<?php echo $collectTitle;?>" class='btn btn-link ajaxCollect'><i class='icon <?php echo $star;?>'></i></a>
<?php endif;?>
<?php common::printLink('doc', 'edit', "docID=$doc->id&comment=false&from={$lang->navGroup->doc}", "<i class='icon icon-edit'></i>", '', "title='{$lang->edit}' class='btn btn-link'")?>
<?php common::printLink('doc', 'edit', "docID=$doc->id&comment=false&from={$lang->navGroup->doc}", "<i class='icon icon-edit'></i>", '', "title='{$lang->edit}' class='btn btn-link iframe'", true, true)?>
<?php common::printLink('doc', 'delete', "docID=$doc->id&confirm=no&from={$lang->navGroup->doc}", "<i class='icon icon-trash'></i>", 'hiddenwin', "title='{$lang->delete}' class='btn btn-link'")?>
<?php endif;?>
</td>
module/my/view/story.html.php
+1 -1
View File
@@ -96,7 +96,7 @@
if($canBeChanged)
{
$vars = "story={$story->id}";
common::printIcon('story', 'change', $vars, $story, 'list', 'alter');
common::printIcon('story', 'change', $vars, $story, 'list', 'alter', '', 'iframe', true);
common::printIcon('story', 'review', $vars, $story, 'list', 'search');
common::printIcon('story', 'close', $vars, $story, 'list', '', '', 'iframe', true);
common::printIcon('story', 'edit', $vars, $story, 'list', '', '', 'iframe', true, "data-width='95%'");
module/my/view/task.html.php
+1 -1
View File
@@ -186,7 +186,7 @@
common::printIcon('task', 'recordEstimate', "taskID=$child->id", $child, 'list', 'time', '', 'iframe', true, '', '', $child->project);
common::printIcon('task', 'edit', "taskID=$child->id", $child, 'list', '', '', '', '', 'data-group="execution"', '', $child->project);
common::printIcon('task', 'batchCreate', "project=$child->project&storyID=$child->story&moduleID=$child->module&taskID=$child->id&ifame=0", $child, 'list', 'split', '', '', '', 'data-group="project"', $this->lang->task->children, $child->project);
common::printIcon('task', 'batchCreate', "executionID=$child->execution&storyID=$child->story&moduleID=$child->module&taskID=$child->id&iframe=0", $child, 'list', 'split', '', 'iframe', true, 'data-group="execution"', $this->lang->task->children, $child->project);
}
}
?>
module/my/view/testtask.html.php
+2 -2
View File
@@ -57,8 +57,8 @@
<?php
common::printIcon('testtask', 'cases', "taskID=$task->id", $task, 'list', 'sitemap', '', '', '', "data-app='qa'");
common::printIcon('testtask', 'view', "taskID=$task->id", '', 'list', 'list-alt', '', 'iframe', true, "data-width='90%'");
common::printIcon('testtask', 'linkCase', "taskID=$task->id", $task, 'list', 'link');
common::printIcon('testreport', 'browse', "objectID=$task->product&objectType=product&extra=$task->id", $task, 'list', 'flag');
common::printIcon('testtask', 'linkCase', "taskID=$task->id", $task, 'list', 'link', '', '', false, "data-app='qa'");
common::printIcon('testreport', 'browse', "objectID=$task->product&objectType=product&extra=$task->id", $task, 'list', 'flag', '', '', false, "data-app='qa'");
common::printIcon('testtask', 'edit', "taskID=$task->id", $task, 'list', '', '', 'iframe', true, "data-width='90%'");
if(common::hasPriv('testtask', 'delete', $task))
{
module/product/view/view.html.php
+27 -23
View File
@@ -21,7 +21,7 @@
<div class="detail">
<h2 class="detail-title"><span class="label-id"><?php echo $product->id;?></span> <span class="label label-light label-outline"><?php echo $product->code;?></span> <?php echo $product->name;?></h2>
<div class="detail-content article-content">
<p><span class="text-limit" data-limit-size="40"><?php echo $product->desc;?></span><a class="text-primary text-limit-toggle small" data-text-expand="<?php echo $lang->expand;?>" data-text-collapse="<?php echo $lang->collapse;?>"></a></p>
<p><?php echo $product->desc;?></p>
<p>
<span class="label label-primary label-outline"><?php echo $lang->product->typeAB . ':' . zget($lang->product->typeList, $product->type);?></span>
<span class="label label-success label-outline"><?php echo $lang->product->status . ':' . $this->processStatus('product', $product);?></span>
@@ -51,15 +51,13 @@
<tbody>
<tr>
<th class='w-65px'><i class="icon icon-person icon-sm"></i> <?php echo $lang->productCommon;?></th>
<td><em><?php echo zget($users, $product->PO);?></em></td>
<td><strong><?php echo zget($users, $product->PO);?></strong></td>
<th><i class="icon icon-person icon-sm"></i> <?php echo $lang->product->release;?></th>
<td><strong><?php echo zget($users, $product->RD);?></strong></td>
</tr>
<tr>
<th><i class="icon icon-person icon-sm"></i> <?php echo $lang->product->qa;?></th>
<td><em><?php echo zget($users, $product->QD);?></em></td>
</tr>
<tr>
<th><i class="icon icon-person icon-sm"></i> <?php echo $lang->product->release;?></th>
<td><em><?php echo zget($users, $product->RD);?></em></td>
<td><strong><?php echo zget($users, $product->QD);?></strong></td>
</tr>
</tbody>
</table>
@@ -71,27 +69,33 @@
<table class="table table-data data-basic">
<tbody>
<tr>
<th class="w-80px"><?php echo $lang->product->code;?></th>
<td><strong><?php echo $product->code;?></strong></td>
<th class="w-80px"><?php echo $lang->story->openedBy?></th>
<td><em><?php echo zget($users, $product->createdBy);?></em></td>
<td><strong><?php echo zget($users, $product->createdBy);?></strong></td>
</tr>
<tr>
<th class="w-80px"><?php echo $lang->product->type;?></th>
<td><strong><?php echo zget($lang->product->typeList, $product->type);?></strong></td>
<th><?php echo $lang->story->openedDate?></th>
<td><em><?php echo formatTime($product->createdDate, DT_DATE1);?></em></td>
<td><strong><?php echo formatTime($product->createdDate, DT_DATE1);?></strong></td>
</tr>
<tr>
<th class="w-80px"><?php echo $lang->product->status;?></th>
<td><strong><?php echo $this->processStatus('product', $product);?></strong></td>
<th><?php echo $lang->product->acl;?></th>
<td><em><?php echo $lang->product->aclList[$product->acl];?></em></td>
<td><strong><?php echo $lang->product->aclList[$product->acl];?></strong></td>
</tr>
<?php if($product->acl == 'custom'):?>
<tr>
<th><?php echo $lang->product->whitelist;?></th>
<td>
<em>
<strong>
<?php
$whitelist = explode(',', $product->whitelist);
foreach($whitelist as $groupID) if(isset($groups[$groupID])) echo $groups[$groupID] . '&nbsp;';
?>
</em>
</strong>
</td>
</tr>
<?php endif;?>
@@ -107,33 +111,33 @@
<?php $space = common::checkNotCN() ? ' ' : '';?>
<tr>
<th><?php echo $lang->story->statusList['active'] . $space . $lang->story->common;?></th>
<td><em><?php echo $product->stories['active']?></em></td>
<td><strong><?php echo $product->stories['active']?></strong></td>
<th><?php echo $lang->product->plans?></th>
<td><em><?php echo $product->plans?></em></td>
<td><strong><?php echo $product->plans?></strong></td>
<th class='w-80px'><?php echo $lang->product->bugs?></th>
<td><em><?php echo $product->bugs?></em></td>
<td><strong><?php echo $product->bugs?></strong></td>
</tr>
<tr>
<th><?php echo $lang->story->statusList['changed'] . $space . $lang->story->common;?></th>
<td><em><?php echo $product->stories['changed']?></em></td>
<td><strong><?php echo $product->stories['changed']?></strong></td>
<th><?php echo $lang->product->projects?></th>
<td><em><?php echo $product->projects?></em></td>
<td><strong><?php echo $product->projects?></strong></td>
<th><?php echo $lang->product->cases?></th>
<td><em><?php echo $product->cases?></em></td>
<td><strong><?php echo $product->cases?></strong></td>
</tr>
<tr>
<th><?php echo $lang->story->statusList['draft'] . $space . $lang->story->common;?></th>
<td><em><?php echo $product->stories['draft']?></em></td>
<td><strong><?php echo $product->stories['draft']?></strong></td>
<th><?php echo $lang->product->builds?></th>
<td><em><?php echo $product->builds?></em></td>
<td><strong><?php echo $product->builds?></strong></td>
<th><?php echo $lang->product->docs?></th>
<td><em><?php echo $product->docs?></em></td>
<td><strong><?php echo $product->docs?></strong></td>
</tr>
<tr>
<th><?php echo $lang->story->statusList['closed'] . $space . $lang->story->common;?></th>
<td><em><?php echo $product->stories['closed']?></em></td>
<td><strong><?php echo $product->stories['closed']?></strong></td>
<th><?php echo $lang->product->releases?></th>
<td><em><?php echo $product->releases?></em></td>
<td><strong><?php echo $product->releases?></strong></td>
</tr>
</tbody>
</table>
module/project/model.php
+2 -1
View File
@@ -248,7 +248,8 @@ class projectModel extends model
->where('type')->eq('project')
->andWhere('deleted')->eq(0)
->beginIF(!$this->app->user->admin)->andWhere('id')->in($this->app->user->view->projects)->fi()
->beginIF($queryType == 'bystatus' and $param != 'all')->andWhere('status')->eq($param)->fi()
->beginIF($queryType == 'bystatus' and $param == 'undone')->andWhere('status')->notIN('done,closed')->fi()
->beginIF($queryType == 'bystatus' and $param != 'all' and $param != 'undone')->andWhere('status')->eq($param)->fi()
->beginIF($queryType == 'byid')->andWhere('id')->eq($param)->fi()
->orderBy($orderBy)
->limit($limit)
module/task/control.php
+2 -2
View File
@@ -251,13 +251,13 @@ class task extends control
die(js::locate($this->createLink('execution', 'task', "executionID=$executionID")));
}
$execution = $this->execution->getById($executionID);
if($this->config->systemMode == 'new')
{
$project = $this->project->getByID($this->session->project);
$project = $this->project->getByID($execution->project);
if($project->model == 'waterfall') $this->config->task->create->requiredFields .= ',estStarted,deadline';
}
$execution = $this->execution->getById($executionID);
if($this->app->openApp == 'my')
{
$taskLink = $this->createLink('my', 'work', 'mode=task');
module/testcase/control.php
-7
View File
@@ -333,13 +333,6 @@ class testcase extends control
{
$this->loadModel('execution')->setMenu($this->session->execution);
}
elseif($this->app->openApp == 'my')
{
$this->loadModel('my')->setMenu();
$this->lang->testcase->menu = $this->lang->my->menu->$from;
if($from == 'work') $this->lang->my->menu->work['subModule'] = 'testcase';
if($from == 'contribute') $this->lang->my->menu->contribute['subModule'] = 'testcase';
}
else
{
$this->testcase->setMenu($this->products, $productID, $branch);
www/js/zui/min.js
+1 -1
View File
File diff suppressed because one or more lines are too long