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

* Fix bug #29410.

Browse Source
This commit is contained in:
mayue
2022-11-14 14:47:50 +08:00
parent 3457c2ade6
commit e45a22f25d
4 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/kanban/model.php
+1 -1
View File
@@ -3900,7 +3900,7 @@ class kanbanModel extends model
if(common::hasPriv('task', 'recordEstimate') and $this->task->isClickable($task, 'recordEstimate')) $menu[] = array('label' => $this->lang->task->recordEstimate, 'icon' => 'time', 'url' => helper::createLink('task', 'recordEstimate', "taskID=$task->id&from=taskkanban", '', true));
if(common::hasPriv('task', 'activate') and $this->task->isClickable($task, 'activate')) $menu[] = array('label' => $this->lang->task->activate, 'icon' => 'magic', 'url' => helper::createLink('task', 'activate', "taskID=$task->id&extra=from=taskkanban", '', true));
if(common::hasPriv('task', 'batchCreate') and $this->task->isClickable($task, 'batchCreate') and !$task->mode) $menu[] = array('label' => $this->lang->task->children, 'icon' => 'split', 'url' => helper::createLink('task', 'batchCreate', "execution=$task->execution&storyID=$task->story&moduleID=$task->module&taskID=$task->id", '', true), 'size' => '95%');
if(common::hasPriv('task', 'create') and $this->task->isClickable($task, 'create') and !$task->mode) $menu[] = array('label' => $this->lang->task->copy, 'icon' => 'copy', 'url' => helper::createLink('task', 'create', "projctID=$task->execution&storyID=$task->story&moduleID=$task->module&taskID=$task->id", '', true), 'size' => '95%');
if(common::hasPriv('task', 'create') and $this->task->isClickable($task, 'create')) $menu[] = array('label' => $this->lang->task->copy, 'icon' => 'copy', 'url' => helper::createLink('task', 'create', "projctID=$task->execution&storyID=$task->story&moduleID=$task->module&taskID=$task->id", '', true), 'size' => '95%');
if(common::hasPriv('task', 'cancel') and $this->task->isClickable($task, 'cancel')) $menu[] = array('label' => $this->lang->task->cancel, 'icon' => 'ban-circle', 'url' => helper::createLink('task', 'cancel', "taskID=$task->id&extra=from=taskkanban", '', true));
if(common::hasPriv('task', 'delete')) $menu[] = array('label' => $this->lang->task->delete, 'icon' => 'trash', 'url' => helper::createLink('task', 'delete', "executionID=$task->execution&taskID=$task->id&confirm=no&from=taskkanban"));
module/task/css/create.css
+1 -1
View File
@@ -28,7 +28,7 @@
.c-modulel {width: 110px;}
.keep-row-height {height: 32px;}
#modalTeam .modal-dialog {min-height: 120px; width: 520px; color: #3c4353;}
#modalTeam .modal-dialog {min-height: 120px; width: 570px; color: #3c4353;}
#taskTeamEditor .hourBox {padding-bottom: 7px; width: 135px;}
#taskTeamEditor .estimateBox {width: 120px;}
#modalTeam .modal-content {padding: 0;}
module/task/view/taskteam.html.php
-5
View File
@@ -11,11 +11,6 @@
#taskTeamEditor .hourBox {padding-bottom: 1px;}
</style>
<?php endif;?>
<?php if($app->rawMethod == 'create' and !empty($task->mode)):?>
<style>
#modalTeam .modal-dialog {width: 570px;}
</style>
<?php endif;?>
<?php if($app->rawMethod == 'assignto'):?>
<style>
#taskTeamEditor td.sort-handler {width: 70px !important;}
module/testcase/view/view.html.php
+6 -4
View File
@@ -161,6 +161,8 @@
<th class='thWidth'><?php echo $lang->testcase->module;?></th>
<td>
<?php
$tab = $this->app->tab;
if(empty($modulePath))
{
echo "/";
@@ -174,7 +176,7 @@
foreach($modulePath as $key => $module)
{
if($this->app->tab == 'qa' || $this->app->tab == 'ops')
if($tab == 'qa' || $tab == 'ops')
{
if($isLibCase)
{
@@ -185,8 +187,8 @@
if(!common::printLink('testcase', 'browse', "productID=$case->product&branch=$module->branch&browseType=byModule&param=$module->id", $module->name)) echo $module->name;
}
}
if($this->app->tab == 'project' and !common::printLink('project', 'testcase', "projectID={$this->session->project}&productID=$case->product&branch=$module->branch&browseType=byModule&param=$module->id", $module->name)) echo $module->name;
if($this->app->tab == 'execution') echo $module->name;
if($tab == 'project' and !common::printLink('project', 'testcase', "projectID={$this->session->project}&productID=$case->product&branch=$module->branch&browseType=byModule&param=$module->id", $module->name)) echo $module->name;
if($tab == 'execution' or $tab == 'product') echo $module->name;
if(isset($modulePath[$key + 1])) echo $lang->arrow;
}
}
@@ -199,7 +201,7 @@
<td>
<?php
$class = isonlybody() ? 'showinonlybody' : 'iframe';
$param = $this->app->tab == 'project' ? "&version=0&projectID={$this->session->project}" : '';
$param = $tab == 'project' ? "&version=0&projectID={$this->session->project}" : '';
if(isset($case->storyTitle))
{
if(common::hasPriv('story', 'view'))