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

* [bug#58994,doing,0.5h] show tips if no data in doc block.

Browse Source
This commit is contained in:
zhouxin
2025-01-08 16:03:15 +08:00
committed by 綦新志
parent 92fb7f27a2
commit 97138b570b
6 changed files with 30 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/caselib/control.php
+6 -1
View File
@@ -146,7 +146,12 @@ class caselib extends control
public function browse(int $libID = 0, string $browseType = 'all', int $param = 0, string $orderBy = 'id_desc', int $recTotal = 0, int $recPerPage = 20, int $pageID = 1, string $from = 'qa', int $blockID = 0)
{
$libraries = $this->caselib->getLibraries();
if(empty($libraries)) $this->locate(inlink('create'));
if(empty($libraries))
{
$this->app->loadLang('doc');
if($from == 'doc') return $this->send(array('result' => 'fail', 'message' => $this->lang->doc->tips->noCaselib));
$this->locate(inlink('create'));
}
/* Set browse type. */
$browseType = strtolower($browseType);
module/doc/lang/de.php
+4
View File
@@ -260,6 +260,10 @@ $lang->doc->emptyError = 'Not empty';
$lang->doc->caselib = 'Case Library';
$lang->doc->customSearch = 'Custom Search';
$lang->doc->tips = new stdclass();
$lang->doc->tips->noCaselib = 'No case lib';
$lang->doc->tips->noProduct = 'No product';
$lang->doc->zentaoList = array();
$lang->doc->zentaoList['story'] = $lang->SRCommon;
$lang->doc->zentaoList['productStory'] = $lang->productCommon . $lang->SRCommon;
module/doc/lang/en.php
+4
View File
@@ -260,6 +260,10 @@ $lang->doc->emptyError = 'Not empty';
$lang->doc->caselib = 'Case Library';
$lang->doc->customSearch = 'Custom Search';
$lang->doc->tips = new stdclass();
$lang->doc->tips->noCaselib = 'No case lib';
$lang->doc->tips->noProduct = 'No product';
$lang->doc->zentaoList = array();
$lang->doc->zentaoList['story'] = $lang->SRCommon;
$lang->doc->zentaoList['productStory'] = $lang->productCommon . $lang->SRCommon;
module/doc/lang/fr.php
+4
View File
@@ -260,6 +260,10 @@ $lang->doc->emptyError = 'Not empty';
$lang->doc->caselib = 'Case Library';
$lang->doc->customSearch = 'Custom Search';
$lang->doc->tips = new stdclass();
$lang->doc->tips->noCaselib = 'No case lib';
$lang->doc->tips->noProduct = 'No product';
$lang->doc->zentaoList = array();
$lang->doc->zentaoList['story'] = $lang->SRCommon;
$lang->doc->zentaoList['productStory'] = $lang->productCommon . $lang->SRCommon;
module/doc/lang/zh-cn.php
+4
View File
@@ -260,6 +260,10 @@ $lang->doc->emptyError = '不能为空';
$lang->doc->caselib = '用例库';
$lang->doc->customSearch = '自定义搜索';
$lang->doc->tips = new stdclass();
$lang->doc->tips->noCaselib = '没有用例库，请先创建用例库';
$lang->doc->tips->noProduct = '没有产品，请先创建产品';
$lang->doc->zentaoList = array();
$lang->doc->zentaoList['story'] = $lang->SRCommon;
$lang->doc->zentaoList['productStory'] = $lang->productCommon . $lang->SRCommon;
module/productplan/control.php
+8 -3
View File
@@ -21,11 +21,16 @@ class productplan extends control
* @access public
* @return void
*/
public function commonAction(int $productID, int $branch = 0)
public function commonAction(int $productID, int $branch = 0, string $from = 'product')
{
$product = $this->loadModel('product')->getById($productID);
$products = $this->product->getPairs('all', 0, '', 'all');
if(empty($product)) $this->locate($this->createLink('product', 'create'));
if(empty($product) && $from != 'doc') $this->locate($this->createLink('product', 'create'));
if(empty($product) && $from == 'doc')
{
$this->app->loadLang('doc');
return $this->send(array('result' => 'fail', 'messaage' => $this->lang->doc->tips->noProduct));
}
$this->product->checkAccess($productID, $products);
@@ -314,7 +319,7 @@ class productplan extends control
$viewType = $this->cookie->viewType ? $this->cookie->viewType : 'list';
$this->commonAction($productID, (int)$branch);
$this->commonAction($productID, (int)$branch, $from);
$product = $this->view->product;
$productName = empty($product) ? '' : $product->name;