* Fix bug#36180,36185

This commit is contained in:
zenggang
2023-07-04 11:59:36 +00:00
parent a772576d6b
commit e071361655
6 changed files with 20 additions and 18 deletions
+4 -4
View File
@@ -147,7 +147,7 @@ $config->repo->search['fields']['product'] = $lang->repo->product;
$config->repo->search['fields']['projects'] = $lang->repo->projects;
$config->repo->search['fields']['SCM'] = $lang->repo->SCM;
$config->repo->search['params']['name'] = array('operator' => 'include', 'control' => 'input', 'values' => array());
$config->repo->search['params']['product'] = array('operator' => 'include', 'control' => 'select', 'values' => array());
$config->repo->search['params']['projects'] = array('operator' => 'include', 'control' => 'select', 'values' => array());
$config->repo->search['params']['SCM'] = array('operator' => 'include', 'control' => 'select', 'values' => $lang->repo->scmList);
$config->repo->search['params']['name'] = array('operator' => 'include', 'control' => 'input', 'values' => '');
$config->repo->search['params']['product'] = array('operator' => 'include', 'control' => 'select', 'values' => '');
$config->repo->search['params']['projects'] = array('operator' => 'include', 'control' => 'select', 'values' => '');
$config->repo->search['params']['SCM'] = array('operator' => '=', 'control' => 'select', 'values' => $lang->repo->scmList);
+10 -2
View File
@@ -97,7 +97,15 @@ class repo extends control
}
$successJobs = $this->loadModel('compile')->getSuccessJobs($jobIDList);
$products = $this->loadModel('product')->getPairs('', 0, '', 'all');
$projects = $this->loadModel('project')->getPairs();
session_start();
$this->config->repo->search['params']['product']['values'] = $products;
$this->config->repo->search['params']['projects']['values'] = $projects;
$this->config->repo->search['actionURL'] = $this->createLink('repo', 'maintain');
$this->config->repo->search['queryID'] = 0;
$this->config->repo->search['onMenuBar'] = 'yes';
$this->loadModel('search')->setSearchParams($this->config->repo->search);
$this->view->title = $this->lang->repo->common . $this->lang->colon . $this->lang->repo->browse;
@@ -106,8 +114,8 @@ class repo extends control
$this->view->objectID = $objectID;
$this->view->pager = $pager;
$this->view->repoList = $repoList;
$this->view->products = $this->loadModel('product')->getPairs('', 0, '', 'all');
$this->view->projects = $this->loadModel('project')->getPairs();
$this->view->products = $products;
$this->view->projects = $projects;
$this->view->sonarRepoList = $sonarRepoList;
$this->view->successJobs = $successJobs;
+2 -4
View File
@@ -35,11 +35,10 @@ foreach($paths as $pathName)
}
if($fileName) $breadcrumbItems[] = h::span($fileName);
echo $revisionName;
$breadcrumbItems[] = h::span
(
setClass('ml-2 label secondary'),
rawContent()
html($revisionName),
);
foreach($blames as $key => $blame)
@@ -62,14 +61,13 @@ foreach($lang->repo->encodingList as $key => $val)
}
$defaultEncode = $lang->repo->encodingList[$encoding];
set::rawContent(false);
featureBar(
backBtn
(
setClass('mr-5'),
set::icon('back'),
set::type('secondary'),
set::back('GLOBAL'),
$lang->goback
),
...$breadcrumbItems
+1 -6
View File
@@ -15,8 +15,6 @@ jsVar('pathSvnTip', $lang->repo->example->path->svn);
jsVar('clientGitTip', $lang->repo->example->client->git);
jsVar('clientSvnTip', $lang->repo->example->client->svn);
set::rawContent(false);
formPanel
(
on::change('#product', 'onProductChange'),
@@ -56,7 +54,7 @@ formPanel
h::span
(
setClass('tips-git leading-8 ml-2'),
rawContent(),
html($lang->repo->syncTips),
),
),
formRow
@@ -198,7 +196,4 @@ formPanel
)
);
echo $lang->repo->syncTips;
render();
+1
View File
@@ -59,6 +59,7 @@ featureBar(
setClass('mr-5'),
set::icon('back'),
set::type('secondary'),
set::back('repo-browse'),
$lang->goback
),
...$breadcrumbItems
+2 -2
View File
@@ -55,9 +55,9 @@ $config->repo->dtable->fieldList['actions']['list']['delete']['url'] = $this->cr
$repos = initTableData($repoList, $config->repo->dtable->fieldList, $this->repo);
featureBar
(
(
set::current('all'),
li(searchToggle(set::module('repo')))
li(searchToggle()),
);
toolBar