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

* Code for task #5343, #5346.

Browse Source
This commit is contained in:
chenfei
2019-03-20 15:58:19 +08:00
parent 7242802aa4
commit fa5f377d52
5 changed files with 29 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/project/css/kanban.css
+4 -1
View File
@@ -19,6 +19,9 @@
.board-item .btn {padding: 2px 10px 2px 23px; font-size: 12px; position: relative; left: -2px; height: 24px;}
.board-item .btn-icon-left > .icon {width: 22px; height: 22px; line-height: 20px; font-size: 14px; opacity: 1; top: 1px}
.board-item .btn-icon-left > span {max-width: 80px; white-space: nowrap; text-overflow: ellipsis; overflow: hidden; display: inline-block;}
.board-title {padding-right: 20px;}
.board-actions {position: absolute; right: 3px; top: 3px;}
.board-actions.nav > li > a {padding: 3px 3px;}
#kanban {overflow-y: auto}
#kanban > .table {min-width: 1100px;}
#kanban.dragging .boards.dragging .board {background: #eee; opacity: .35; border-color: #f1f1f1}
@@ -43,4 +46,4 @@
#kanban .group-title {word-break: break-all; line-height: 16px; padding: 3px 0; display: block;}
.table-grouped > tbody > tr,
.table-grouped > tbody > tr:hover {background: #fff!important;}
.table-grouped > tbody > tr:hover {background: #fff!important;}
module/project/view/kanban.html.php
+18 -1
View File
@@ -113,7 +113,24 @@ $account = $this->app->user->account;
<?php if($type == 'story'):?>
<?php $story = $group;?>
<div class='board-story' data-id='<?php echo $story->id;?>'>
<?php echo html::a($this->createLink('story', 'view', "storyID=$story->id", '', true), $story->title, '', 'class="kanbaniframe group-title" title="' . $story->title . '"');?>
<div class='board-title'>
<?php echo html::a($this->createLink('story', 'view', "storyID=$story->id", '', true), $story->title, '', 'class="kanbaniframe group-title" title="' . $story->title . '"');?>
<nav class='board-actions nav nav-default'>
<li class='dropdown'>
<a href='javascript:;' data-toggle='dropdown' class='panel-action'><i class='icon icon-ellipsis-v'></i></a>
<ul class='dropdown-menu pull-right'>
<?php
$misc = "data-toggle='modal' data-type='iframe' data-width='95%'";
echo (common::hasPriv('task', 'create')) ? '<li>' . html::a($this->createLink('task', 'create', "projectID=$story->project&storyID=$story->id&moduleID=$story->module", '', true), $lang->project->wbs, '', $misc) : '' . '</li>';
echo (common::hasPriv('task', 'batchCreate')) ? '<li>' . html::a($this->createLink('task', 'batchCreate', "projectID=$story->project&storyID=$story->id&moduleID=0&taskID=0&iframe=true", '', true), $lang->project->batchWBS, '', $misc) : '' . '</li>';
echo (common::hasPriv('project', 'unlinkStory')) ? '<li>' . html::a($this->createLink('project', 'unlinkStory', "projectID=$story->project&storyID=$story->story&confirm=no", '', true), $lang->project->unlinkStory, 'hiddenwin') : '' . '</li>';
$misc = "data-toggle='modal' data-type='iframe'";
echo (common::hasPriv('story', 'close')) ? '<li>' . html::a($this->createLink('story', 'close', "storyID=$story->id", '', true), $lang->story->close, '', $misc) : '' . '</li>';
?>
</ul>
</li>
</nav>
</div>
<div class="small group-info">
<span class='story-id board-id' title='<?php echo $lang->story->id?>'>#<?php echo $story->id?></span>
<span class='label-pri label-pri-<?php echo $story->pri?>' title='<?php echo $lang->story->pri?>'><?php echo zget($lang->story->priList, $story->pri);?></span>
module/task/control.php
+2 -7
View File
@@ -125,12 +125,7 @@ class task extends control
}
/* If link from no head then reload*/
if(isonlybody())
{
$response['locate'] = 'reload';
$response['target'] = 'parent';
$this->send($response);
}
if(isonlybody()) $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'closeModal' => true));
if($todoID > 0)
{
@@ -244,7 +239,7 @@ class task extends control
if(dao::isError()) $this->send(array('result' => 'fail', 'message' => dao::getError()));
/* Locate the browser. */
if(!empty($iframe)) $this->send(array('result' => 'success', 'locate' => 'parent'));
if(!empty($iframe)) $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'closeModal' => true));
$this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => $storyLink));
}
module/task/view/view.html.php
+4
View File
@@ -258,6 +258,10 @@
<th><?php echo $lang->task->status;?></th>
<td><span class='status-task status-<?php echo $task->status;?>'><span class="label label-dot"></span> <?php echo zget($lang->task->statusList, $task->status);?></td>
</tr>
<tr>
<th><?php echo $lang->task->progress;?></th>
<td><?php echo $task->progress . '%';?></td>
</tr>
<tr>
<th><?php echo $lang->task->pri;?></th>
<td><span class='label-pri <?php echo 'label-pri-' . $task->pri;?>' title='<?php echo zget($lang->task->priList, $task->pri);?>'><?php echo $task->pri == '0' ? $lang->noData : zget($lang->task->priList, $task->pri)?></span></td>
module/testcase/control.php
+1 -6
View File
@@ -239,12 +239,7 @@ class testcase extends control
$this->action->create('case', $caseID, 'Opened');
/* If link from no head then reload. */
if(isonlybody())
{
$response['locate'] = 'reload';
$response['target'] = 'parent';
$this->send($response);
}
if(isonlybody()) $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'closeModal' => true));
setcookie('caseModule', (int)$this->post->module, 0, $this->config->webRoot);
$response['locate'] = $this->createLink('testcase', 'browse', "productID={$this->post->product}&branch={$this->post->branch}&browseType=all&param=0&orderBy=id_desc");