From fa5f377d5246c3548d30ca633e6c0c63b9475107 Mon Sep 17 00:00:00 2001
From: chenfei <chenfei@cnezsoft.com>
Date: Wed, 20 Mar 2019 15:58:19 +0800
Subject: [PATCH]  * Code for task #5343, #5346.

---
 module/project/css/kanban.css       |  5 ++++-
 module/project/view/kanban.html.php | 19 ++++++++++++++++++-
 module/task/control.php             |  9 ++-------
 module/task/view/view.html.php      |  4 ++++
 module/testcase/control.php         |  7 +------
 5 files changed, 29 insertions(+), 15 deletions(-)

diff --git a/module/project/css/kanban.css b/module/project/css/kanban.css
index c9ccad2451..a44b02dfe1 100644
--- a/module/project/css/kanban.css
+++ b/module/project/css/kanban.css
@@ -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;}
\ No newline at end of file
+.table-grouped > tbody > tr:hover {background: #fff!important;}
diff --git a/module/project/view/kanban.html.php b/module/project/view/kanban.html.php
index 2806e366be..b32a7f3ef3 100644
--- a/module/project/view/kanban.html.php
+++ b/module/project/view/kanban.html.php
@@ -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>
diff --git a/module/task/control.php b/module/task/control.php
index 684a4087c3..e96e10334a 100644
--- a/module/task/control.php
+++ b/module/task/control.php
@@ -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));
         }
 
diff --git a/module/task/view/view.html.php b/module/task/view/view.html.php
index dde92eebb0..83e46c070d 100644
--- a/module/task/view/view.html.php
+++ b/module/task/view/view.html.php
@@ -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>
diff --git a/module/testcase/control.php b/module/testcase/control.php
index 8dae13af0e..5403fd8ec5 100644
--- a/module/testcase/control.php
+++ b/module/testcase/control.php
@@ -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");