* adjust for mhtml.

This commit is contained in:
wangyidong
2021-06-08 13:33:34 +08:00
parent 608b41e153
commit 3893084999
4 changed files with 8 additions and 13 deletions
+2 -11
View File
@@ -592,18 +592,9 @@ class gitlab
{
if(!scm::checkRevision($revision)) return array();
$api = "commits/{$revision}/diff";
$params = new stdclass;
$params->page = 1;
$params->per_page = 200;
$allResults = array();
while($results = $this->fetch($api, $params))
{
$params->page ++;
$allResults = $allResults + $results;
}
$files = array();
$allResults = $this->fetch($api);
$files = array();
foreach($allResults as $row)
{
$file = new stdclass();
+2
View File
@@ -33,6 +33,8 @@ class index extends control
*/
public function index($open = '')
{
if($this->app->getViewType() == 'mhtml') $this->locate($this->createLink('my', 'index'));
$latestVersionList = array();
if(isset($this->config->global->latestVersionList)) $latestVersionList = json_decode($this->config->global->latestVersionList);
+2
View File
@@ -334,6 +334,7 @@ class product extends control
}
if($this->app->openApp == 'program') $this->loadModel('program')->setMenu($programID);
if($this->app->getViewType() == 'mhtml') $this->product->setMenu('');
$this->loadModel('user');
$poUsers = $this->user->getPairs('nodeleted|pofirst|noclosed', '', $this->config->maxCount);
@@ -1030,6 +1031,7 @@ class product extends control
if($activeMenu == 'testtask') $this->lang->execution->menu->qa['subMenu']->testtask['subModule'] = 'product';
if($activeMenu == 'testreport') $this->lang->execution->menu->qa['subMenu']->testreport['subModule'] = 'product';
}
if($this->app->getViewType() == 'mhtml') $this->product->setMenu('');
$this->view->title = $this->lang->$moduleName->common;
$this->view->objectID = $objectID;
+2 -2
View File
@@ -1797,11 +1797,11 @@ class productModel extends model
public function setMenu($productID, $branch = 0, $module = 0, $moduleType = '', $extra = '')
{
$product = $this->getByID($productID);
$params = array('branch' => $branch);
common::setMenuVars('product', $productID, $params);
if(!$product) return;
$this->lang->switcherMenu = $this->getSwitcher($productID, $extra, $branch);
$params = array('branch' => $branch);
common::setMenuVars('product', $productID, $params);
if($product->type == 'normal')
{