* fix bug.

This commit is contained in:
wangyidong
2019-05-17 09:33:00 +08:00
parent 027c72c80a
commit 27b5991f94
6 changed files with 10 additions and 6 deletions
+1 -1
View File
@@ -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);
+1
View File
@@ -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'>
+2 -1
View File
@@ -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();
+2 -2
View File
@@ -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>
+1 -1
View File
@@ -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')
+3 -1
View File
@@ -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)
{