Merge branch 'master' of https://github.com/easysoft/zentaopms

module/testcase/model.php

@@ -287,7 +287,7 @@ class testcaseModel extends model
             $data[$i]->type         = $cases->type[$i];
             $data[$i]->pri          = $cases->pri[$i];
             $data[$i]->stage        = empty($cases->stage[$i]) ? '' : implode(',', $cases->stage[$i]);
-            $data[$i]->story        = $storyID ? $storyID : $cases->story[$i];
+            $data[$i]->story        = $cases->story[$i];
             $data[$i]->color        = $cases->color[$i];
             $data[$i]->title        = $cases->title[$i];
             $data[$i]->precondition = $cases->precondition[$i];

module/testtask/view/groupcase.html.php

@@ -14,6 +14,7 @@
 <?php include '../../common/view/treetable.html.php';?>
 <?php include './caseheader.html.php';?>
 <?php js::set('browseType', $browseType);?>
+<?php js::set('confirmUnlink', $lang->testtask->confirmUnlinkCase)?>
 <div class="main-table" data-ride="table" data-checkable="false" data-group="true">
   <table class='table table-grouped text-center' id='treetable'>
     <thead>
@@ -77,7 +78,13 @@
         <td class='c-actions'>
           <?php common::printIcon('testtask', 'runCase', "runID=$run->id&caseID=$run->case&version=$run->caseVersion", '', 'list', 'play', '', 'runCase iframe', false, "data-width='95%'");?>
           <?php common::printIcon('testcase', 'edit', "caseID=$run->case", '', 'list');?>
-          <?php common::printIcon('testcase', 'delete', "caseID=$run->case", '', 'list', '', 'hiddenwin');?>
+          <?php
+                if(common::hasPriv('testtask', 'unlinkCase', $run))
+                {
+                    $unlinkURL = helper::createLink('testtask', 'unlinkCase', "caseID=$run->id&confirm=yes");
+                    echo html::a("javascript:ajaxDelete(\"$unlinkURL\", \"casesForm\", confirmUnlink)", '<i class="icon-unlink"></i>', '', "title='{$this->lang->testtask->unlinkCase}' class='btn'");
+                }
+          ?>
         </td>
       </tr>
       <?php $i++;?>

module/webhook/control.php

@@ -135,6 +135,19 @@ class webhook extends control
      */
     public function log($id, $orderBy = 'id_desc', $recTotal = 0, $recPerPage = 20, $pageID = 1)
     {
+        /* Save session. */
+        $uri   = $this->app->getURI(true);
+        $this->session->set('productList',     $uri);
+        $this->session->set('productPlanList', $uri);
+        $this->session->set('releaseList',     $uri);
+        $this->session->set('storyList',       $uri);
+        $this->session->set('projectList',     $uri);
+        $this->session->set('taskList',        $uri);
+        $this->session->set('buildList',       $uri);
+        $this->session->set('bugList',         $uri);
+        $this->session->set('caseList',        $uri);
+        $this->session->set('testtaskList',    $uri);
+
         $this->app->loadClass('pager', $static = true);
         $pager = new pager($recTotal, $recPerPage, $pageID);
 

module/webhook/model.php

@@ -87,10 +87,14 @@ class webhookModel extends model
             }
 
             $text = '';
-            if(isset($data->markdown) and is_object($data->markdown)) 
+            if(isset($data->markdown->text))
             {
                 $text = substr($data->markdown->text, 0, strpos($data->markdown->text, '(http'));
             }
+            elseif(isset($data->markdown->content))
+            {
+                $text = substr($data->markdown->content, 0, strpos($data->markdown->content, '(http'));
+            }
             else
             {
                 $text = substr($data->text, 0, strpos($data->text, '(http')) ? substr($data->text, 0, strpos($data->text, '(http')) : zget($users, $data->user, $this->app->user->realname) . $this->lang->action->label->{$action->action} . $this->lang->action->objectTypes[$action->objectType] . "[#{$action->objectID}::{$object->$field}]";
@@ -321,9 +325,9 @@ class webhookModel extends model
                 $this->saveData($id, $actionID, $postData, $actor);
                 continue;
             }
-            
+
             $result = $this->fetchHook($webhook, $postData, $actionID);
-            $this->saveLog($webhook, $actionID, $postData, $result);
+            if(!empty($result)) $this->saveLog($webhook, $actionID, $postData, $result);
         }
         return !dao::isError();
     }

module/webhook/view/browse.html.php

@@ -34,7 +34,8 @@
           <td class='text' title='<?php echo $webhook->url;?>'><?php echo $webhook->url;?></td>
           <td class='c-actions text-right'>
             <?php
-            if($webhook->type == 'dinguser' or $webhook->type == 'wechatuser') common::printIcon('webhook', 'chooseDept', "webhookID=$id", '', 'list', 'link');
+            if($webhook->type == 'dinguser') common::printIcon('webhook', 'chooseDept', "webhookID=$id", '', 'list', 'link');
+            if($webhook->type == 'wechatuser') common::printIcon('webhook', 'bind', "webhookID=$id", '', 'list', 'link');
             common::printIcon('webhook', 'log', "webhookID=$id", '', 'list', 'file-text');
             common::printIcon('webhook', 'edit', "webhookID=$id", '', 'list');
             if(common::hasPriv('webhook', 'delete'))