From 27b5991f94d3740a2afbd3166ff003b38d3e4ca7 Mon Sep 17 00:00:00 2001
From: wangyidong <yidong@cnezsoft.com>
Date: Fri, 17 May 2019 09:33:00 +0800
Subject: [PATCH]  * fix bug.

---
 module/group/control.php              | 2 +-
 module/group/view/manageview.html.php | 1 +
 module/message/model.php              | 3 ++-
 module/task/view/view.html.php        | 4 ++--
 module/testcase/control.php           | 2 +-
 www/js/my.full.js                     | 4 +++-
 6 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/module/group/control.php b/module/group/control.php
index 0e7ac737d3..9561f1ea4d 100644
--- a/module/group/control.php
+++ b/module/group/control.php
@@ -133,7 +133,7 @@ class group extends control
             $this->group->updateView($groupID);
             if(dao::isError()) $this->send(array('result' => 'fail', 'message' => dao::getError()));
 
-            $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => inlink('browse')));
+            $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => 'reload'));
         }
 
         $group = $this->group->getById($groupID);
diff --git a/module/group/view/manageview.html.php b/module/group/view/manageview.html.php
index e06de2c10f..71f47d1568 100644
--- a/module/group/view/manageview.html.php
+++ b/module/group/view/manageview.html.php
@@ -74,6 +74,7 @@
         <td class='pl-0px pt-0px'>
           <table class='table table-form'>
             <?php foreach($lang->menu as $module => $title):?>
+            <?php if(!is_string($title)) continue;?>
             <?php if(!isset($lang->action->dynamicAction->$module) and !isset($menugroup[$module])) continue;?>
             <tr id='<?php echo "{$module}ActionBox";?>'>
               <th class='w-100px text-left text-top'>
diff --git a/module/message/model.php b/module/message/model.php
index 31d05e3620..743ba3e617 100644
--- a/module/message/model.php
+++ b/module/message/model.php
@@ -123,7 +123,8 @@ class messageModel extends model
         if($toList == $this->app->user->account) return false;
 
         $moduleName = $objectType == 'case' ? 'testcase' : $objectType;
-        $data  = $this->app->user->realname . $this->lang->action->label->$actionType . $this->lang->action->objectTypes[$objectType];
+        $space = $this->app->getClientLang() == 'en' ? ' ' : '';
+        $data  = $this->app->user->realname . $space . $this->lang->action->label->$actionType . $space . $this->lang->action->objectTypes[$objectType];
         $data .= ' ' . html::a(helper::createLink($moduleName, 'view', "id=$objectID"), "[#{$objectID}::{$object->$field}]");
 
         $notify = new stdclass();
diff --git a/module/task/view/view.html.php b/module/task/view/view.html.php
index 5d811ce460..b8ed98dfec 100644
--- a/module/task/view/view.html.php
+++ b/module/task/view/view.html.php
@@ -342,8 +342,8 @@
         <div class="detail-content">
           <table class='table table-data'>
             <?php $widthClass = $app->getClientLang() == 'en' ? 'w-90px' : 'w-70px';?>
-            <tr class='<?php echo $widthClass;?>'>
-              <th><?php echo $lang->task->estimate;?></th>
+            <tr>
+              <th class='<?php echo $widthClass;?>'><?php echo $lang->task->estimate;?></th>
               <td><?php echo $task->estimate . $lang->workingHour;?></td>
             </tr>
             <tr>
diff --git a/module/testcase/control.php b/module/testcase/control.php
index 00f6c1b4c6..a5b2bc89e7 100644
--- a/module/testcase/control.php
+++ b/module/testcase/control.php
@@ -1106,7 +1106,7 @@ class testcase extends control
             }
 
             $stmt = $this->dao->select('t1.*')->from(TABLE_TESTRESULT)->alias('t1')
-                ->leftJoin('TABLE_TESTRUN')->alias('t2')->on('t1.run=t2.id')
+                ->leftJoin(TABLE_TESTRUN)->alias('t2')->on('t1.run=t2.id')
                 ->where('t1.`case`')->in(array_keys($cases))
                 ->beginIF($taskID)->andWhere('t2.task')->eq($taskID)->fi()
                 ->orderBy('id_desc')
diff --git a/www/js/my.full.js b/www/js/my.full.js
index 758c486794..6d3469eabe 100644
--- a/www/js/my.full.js
+++ b/www/js/my.full.js
@@ -733,7 +733,9 @@ function convertURL()
 
     $('.article-content, .article>.content').each(function()
     {
-        var aTags = iframeTags = imgTags = [];
+        var aTags = [];
+        var iframeTags = [];
+        var imgTags = [];
         var content = $(this).html();
         $(this).find('a').each(function(i)
         {