From 1060a606c6659ade720cf0812d20a98ca9b47d79 Mon Sep 17 00:00:00 2001
From: wangyidong <yidong@cnezsoft.com>
Date: Mon, 18 Dec 2017 17:16:34 +0800
Subject: [PATCH]  * finish task #3455.

---
 lib/base/dao/dao.class.php  | 2 +-
 module/story/model.php      | 4 ++--
 module/task/config.php      | 6 ++++--
 module/task/model.php       | 9 ++++++++-
 module/testcase/control.php | 2 +-
 5 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/lib/base/dao/dao.class.php b/lib/base/dao/dao.class.php
index 7192a30ace..c63fd0a09d 100644
--- a/lib/base/dao/dao.class.php
+++ b/lib/base/dao/dao.class.php
@@ -800,7 +800,7 @@ class baseDAO
 
         $this->setFields($field);
         $result = $this->query()->fetch(PDO::FETCH_OBJ);
-        dao::$cache[$table][$key] = $result;
+        dao::$cache[$table][$key] = getRow($result);
         return $result ? $result->$field : '';
     }
 
diff --git a/module/story/model.php b/module/story/model.php
index aee5ab9a20..9c49d4662e 100644
--- a/module/story/model.php
+++ b/module/story/model.php
@@ -2512,13 +2512,13 @@ class storyModel extends model
         $history = $this->action->getHistory($actionID);
         $action->history    = isset($history[$actionID]) ? $history[$actionID] : array();
         $action->appendLink = '';
-        if(strpos($action->extra, ':')!== false)
+        if(strpos($action->extra, ':') !== false)
         {
             list($extra, $id) = explode(':', $action->extra);
             $action->extra    = $extra;
             if($id)
             {
-                $name  = $this->dao->select('title')->from(TABLE_STORY)->where('id')->eq($id)->fetch('title');
+                $name = $this->dao->select('title')->from(TABLE_STORY)->where('id')->eq($id)->fetch('title');
                 if($name) $action->appendLink = html::a(zget($this->config->mail, 'domain', common::getSysURL()) . helper::createLink($action->objectType, 'view', "id=$id"), "#$id " . $name);
             }
         }
diff --git a/module/task/config.php b/module/task/config.php
index 4d6e6bb4f4..50160daefa 100644
--- a/module/task/config.php
+++ b/module/task/config.php
@@ -173,10 +173,12 @@ $config->task->datatable->fieldList['closedReason']['fixed']    = 'no';
 $config->task->datatable->fieldList['closedReason']['width']    = '80';
 $config->task->datatable->fieldList['closedReason']['required'] = 'no';
 
-$config->task->datatable->fieldList['story']['title']    = 'story';
+global $lang;
+$config->task->datatable->fieldList['story']['title']    = "S";
 $config->task->datatable->fieldList['story']['fixed']    = 'no';
-$config->task->datatable->fieldList['story']['width']    = '80';
+$config->task->datatable->fieldList['story']['width']    = '30';
 $config->task->datatable->fieldList['story']['required'] = 'no';
+$config->task->datatable->fieldList['story']['name']     = $lang->task->story;
 
 $config->task->datatable->fieldList['mailto']['title']    = 'mailto';
 $config->task->datatable->fieldList['mailto']['fixed']    = 'no';
diff --git a/module/task/model.php b/module/task/model.php
index fc6df284b5..b1dbdfd889 100644
--- a/module/task/model.php
+++ b/module/task/model.php
@@ -2118,7 +2118,14 @@ class taskModel extends model
                 case 'story':
                     if(!empty($task->storyID))
                     {
-                        if(!common::printLink('story', 'view', "storyid=$task->storyID", $task->storyTitle)) echo $task->storyTitle;
+                        if(common::hasPriv('story', 'view'))
+                        {
+                            echo html::a(helper::createLink('story', 'view', "storyid=$task->storyID", 'html', true), "<i class='icon icon-{$this->lang->icons['story']}'></i>", '', "class='iframe' title='{$task->storyTitle}'");
+                        }
+                        else
+                        {
+                            echo $task->storyTitle;
+                        }
                     }
                     break;
                 case 'mailto':
diff --git a/module/testcase/control.php b/module/testcase/control.php
index 7dddc2cc14..c8c7ee1581 100644
--- a/module/testcase/control.php
+++ b/module/testcase/control.php
@@ -1531,7 +1531,7 @@ class testcase extends control
                             $num     = $out[1];
                             $sign    = $out[2];
                             $signbit = $sign == '.' ? 1 : 3;
-                            $step    = trim(substr($step, strlen($num) + $signbit));
+                            $step    = trim(substr($step, strpos($step, $sign) + $signbit));
                             if(!empty($step)) $caseStep[$num]['content'] = $step;
                             $caseStep[$num]['type'] = 'step';
                         }