Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

Merge branch 'sprint/208_tianshujie_fixbug' into 'master'

Browse Source 
* Fixed TAB return error.

See merge request easycorp/zentaopms!4261
This commit is contained in:
王怡栋
2022-06-30 05:43:43 +00:00
parent cb21396b98 98b100b6d1
commit ce908479e7
4 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/common/model.php
+4 -2
View File
@@ -1796,18 +1796,20 @@ EOD;
* Print back link
*
* @param string $backLink
* @param string $class
* @param string $misc
* @static
* @access public
* @return void
*/
static public function printBack($backLink, $class = '')
static public function printBack($backLink, $class = '', $misc = '')
{
global $lang, $app;
if(isonlybody()) return false;
if(empty($class)) $class = 'btn';
$title = $lang->goback . $lang->backShortcutKey;
echo html::a($backLink, '<i class="icon-goback icon-back"></i> ' . $lang->goback, '', "id='back' class='{$class}' title={$title} data-app='{$app->tab}'");
echo html::a($backLink, '<i class="icon-goback icon-back"></i> ' . $lang->goback, '', "id='back' class='{$class}' title={$title} $misc");
}
/**
module/testtask/view/linkcase.html.php
+1 -1
View File
@@ -14,7 +14,7 @@
<?php include '../../common/view/tablesorter.html.php';?>
<div id='mainMenu' class='clearfix'>
<div class='btn-toolbar pull-left'>
<?php echo html::backButton('<i class="icon icon-back icon-sm"></i> ' . $lang->goback, '', 'btn btn-secondary');?>
<?php echo html::backButton('<i class="icon icon-back icon-sm"></i> ' . $lang->goback, "data-app='{$app->tab}'", 'btn btn-secondary');?>
<div class='divider'></div>
<?php
$lang->testtask->linkCase = $lang->testtask->linkByStory;
module/testtask/view/report.html.php
+1 -1
View File
@@ -13,7 +13,7 @@
<?php include '../../common/view/header.html.php';?>
<div id="mainMenu" class="clearfix">
<div class="btn-toolbar pull-left">
<?php echo html::backButton('<i class="icon-goback icon-back"></i> ' . $lang->goback, '', 'btn btn-link');?>
<?php echo html::backButton('<i class="icon-goback icon-back"></i> ' . $lang->goback, "data-app='{$app->tab}'", 'btn btn-link');?>
<div class='divider'></div>
<div class='page-title'>
<span class='text'><?php echo $lang->testtask->report->common;?></span>
module/testtask/view/view.html.php
+1 -1
View File
@@ -15,7 +15,7 @@
<?php $browseLink = $this->session->testtaskList ? $this->session->testtaskList : $this->createLink('testtask', 'browse', "productID=$task->product");?>
<div id='mainMenu' class='clearfix'>
<div class='btn-toolbar pull-left'>
<?php echo html::backButton('<i class="icon icon-back icon-sm"></i> ' . $lang->goback, '', 'btn btn-secondary');?>
<?php echo html::backButton('<i class="icon icon-back icon-sm"></i> ' . $lang->goback, "data-app='{$app->tab}'", 'btn btn-secondary');?>
<div class='divider'></div>
<div class='page-title'>
<span class='label label-id'><?php echo $task->id;?></span>