From 48b8cea00c1a43137ffa638e66aa487ffa3d8107 Mon Sep 17 00:00:00 2001 From: holan20180123 Date: Fri, 16 Jul 2021 16:42:37 +0800 Subject: [PATCH 1/2] * Adjust product list. --- module/product/model.php | 2 +- module/product/view/all.html.php | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/module/product/model.php b/module/product/model.php index 382c71737a..42fb36592a 100644 --- a/module/product/model.php +++ b/module/product/model.php @@ -1368,7 +1368,7 @@ class productModel extends model if(empty($products)) return array(); $productKeys = array_keys($products); - if($orderBy == 'program_asc') + if($orderBy == 'program_asc' and $this->config->systemMode == 'new') { $products = $this->dao->select('t1.id as id, t1.*')->from(TABLE_PRODUCT)->alias('t1') ->leftJoin(TABLE_PROGRAM)->alias('t2')->on('t1.program = t2.id') diff --git a/module/product/view/all.html.php b/module/product/view/all.html.php index 79bab6c722..811ed917a8 100644 --- a/module/product/view/all.html.php +++ b/module/product/view/all.html.php @@ -69,6 +69,7 @@ + $program):?> $line):?> - + + config->systemMode == 'new' and $programID) { From aa9871385affb19d2c9dcc6b983a22afaac26d8d Mon Sep 17 00:00:00 2001 From: wangyidong Date: Fri, 16 Jul 2021 16:49:35 +0800 Subject: [PATCH 2/2] * fix bug #13618. --- module/repo/control.php | 2 ++ module/repo/model.php | 2 +- module/repo/view/blame.html.php | 5 +++-- module/repo/view/browse.html.php | 12 +++++++----- module/repo/view/diff.html.php | 9 +++++---- module/repo/view/revision.html.php | 2 +- module/repo/view/view.html.php | 5 +++-- 7 files changed, 22 insertions(+), 15 deletions(-) diff --git a/module/repo/control.php b/module/repo/control.php index 130f006218..8445e36a33 100644 --- a/module/repo/control.php +++ b/module/repo/control.php @@ -345,6 +345,7 @@ class repo extends control public function browse($repoID = 0, $branchID = '', $objectID = 0, $path = '', $revision = 'HEAD', $refresh = 0) { $repoID = $this->repo->saveState($repoID, $objectID); + if($branchID) $branchID = base64_decode($branchID); /* Get path and refresh. */ if($this->get->repoPath) $path = $this->get->repoPath; @@ -1145,6 +1146,7 @@ class repo extends control { $repo = $this->repo->getRepoByID($repoID); $branches = $this->repo->getBranches($repo); + if($branchID) $branchID = base64_decode($branchID); $branchesHtml = "
"; foreach($branches as $id => $branchName) diff --git a/module/repo/model.php b/module/repo/model.php index 4678b98dec..f4957003c4 100644 --- a/module/repo/model.php +++ b/module/repo/model.php @@ -104,7 +104,7 @@ class repoModel extends model $branchName = isset($branches[$branch]) ? $branches[$branch] : $branches[0]; - $dropMenuLink = helper::createLink('repo', 'ajaxGetBranchDropMenu', "repID=$repoID&branchID=$branchID&objectID=$objectID"); + $dropMenuLink = helper::createLink('repo', 'ajaxGetBranchDropMenu', "repID=$repoID&branchID=" . base64_encode($branchID) . "&objectID=$objectID"); $output .= "
"; diff --git a/module/repo/view/blame.html.php b/module/repo/view/blame.html.php index f9f945b4d9..dd129dc110 100644 --- a/module/repo/view/blame.html.php +++ b/module/repo/view/blame.html.php @@ -31,14 +31,15 @@ css::import($jsRoot . 'misc/highlight/styles/github.css');
repo->createLink('browse', "repoID=$repoID&branchID=$branchID&objectID=$objectID"), $repo->name, '', "data-app='{$app->openApp}'"); + $base64BranchID = base64_encode($branchID); + echo html::a($this->repo->createLink('browse', "repoID=$repoID&branchID=$base64BranchID&objectID=$objectID"), $repo->name, '', "data-app='{$app->openApp}'"); $paths = explode('/', $entry); $fileName = array_pop($paths); $postPath = ''; foreach($paths as $pathName) { $postPath .= $pathName . '/'; - echo '/' . ' ' . html::a($this->repo->createLink('browse', "repoID=$repoID&branchID=$branchID&objectID=$objectID&path=" . $this->repo->encodePath($postPath)), trim($pathName, '/'), '', "data-app='{$app->openApp}'"); + echo '/' . ' ' . html::a($this->repo->createLink('browse', "repoID=$repoID&branchID=$base64BranchID&objectID=$objectID&path=" . $this->repo->encodePath($postPath)), trim($pathName, '/'), '', "data-app='{$app->openApp}'"); } echo '/' . ' ' . $fileName; echo " " . $revisionName . ''; diff --git a/module/repo/view/browse.html.php b/module/repo/view/browse.html.php index b3ca9cf324..d04c2be3a6 100644 --- a/module/repo/view/browse.html.php +++ b/module/repo/view/browse.html.php @@ -29,7 +29,8 @@ $branchName) { - echo "
  • " . html::a($this->createLink('repo', 'browse', "repoID=$repoID&branchID=$id&objectID=$objectID"), $branchName, '', "title='{$branchName}' class='text-ellipsis' data-app='{$app->openApp}'") . "
    • "; + $base64BranchID = base64_encode($id); + echo "
  • " . html::a($this->createLink('repo', 'browse', "repoID=$repoID&branchID=$base64BranchID&objectID=$objectID"), $branchName, '', "title='{$branchName}' class='text-ellipsis' data-app='{$app->openApp}'") . "
    • "; } ?> @@ -38,14 +39,15 @@
    repo->createLink('browse', "repoID=$repoID&branchID=$branchID&objectID=$objectID"), $repo->name, '', "data-app='{$app->openApp}'"); + $base64BranchID = base64_encode($branchID); + echo html::a($this->repo->createLink('browse', "repoID=$repoID&branchID=$base64BranchID&objectID=$objectID"), $repo->name, '', "data-app='{$app->openApp}'"); $paths= explode('/', $path); $fileName = array_pop($paths); $postPath = ''; foreach($paths as $pathName) { $postPath .= $pathName . '/'; - echo '/' . ' ' . html::a($this->repo->createLink('browse', "repoID=$repoID&branchID=$branchID&objectID=$objectID&path=" . $this->repo->encodePath($postPath)), trim($pathName, '/'), '', "data-app='{$app->openApp}'"); + echo '/' . ' ' . html::a($this->repo->createLink('browse', "repoID=$repoID&branchID=$base64BranchID&objectID=$objectID&path=" . $this->repo->encodePath($postPath)), trim($pathName, '/'), '', "data-app='{$app->openApp}'"); } echo '/' . ' ' . $fileName; ?> @@ -54,7 +56,7 @@
    repo->notice->lastSyncTime . $cacheTime?> - repo->createLink('browse', "repoID=$repoID&branchID=$branchID&objectID=$objectID&path=" . $this->repo->encodePath($path) . "&revision=$revision&refresh=1"), " " . $lang->refresh, '', "class='btn btn-primary' data-app={$app->openApp}");?> + repo->createLink('browse', "repoID=$repoID&branchID=$base64BranchID&objectID=$objectID&path=" . $this->repo->encodePath($path) . "&revision=$revision&refresh=1"), " " . $lang->refresh, '', "class='btn btn-primary' data-app={$app->openApp}");?>
    @@ -80,7 +82,7 @@ name, '/'); - $link = $info->kind == 'dir' ? $this->repo->createLink('browse', "repoID=$repoID&branchID=$branchID&objectID=$objectID&path=" . $this->repo->encodePath($infoPath)) : $this->repo->createLink('view', "repoID=$repoID&objectID=$objectID&entry=" . $this->repo->encodePath($infoPath)); + $link = $info->kind == 'dir' ? $this->repo->createLink('browse', "repoID=$repoID&branchID=$base64BranchID&objectID=$objectID&path=" . $this->repo->encodePath($infoPath)) : $this->repo->createLink('view', "repoID=$repoID&objectID=$objectID&entry=" . $this->repo->encodePath($infoPath)); echo html::a($link, $info->name, '', "title='{$info->name}' data-app={$app->openApp}"); ?> diff --git a/module/repo/view/diff.html.php b/module/repo/view/diff.html.php index 59e039f51c..0eb648aa81 100644 --- a/module/repo/view/diff.html.php +++ b/module/repo/view/diff.html.php @@ -29,13 +29,14 @@
    repo->createLink('browse', "repoID=$repoID&branchID=&objectID=$objectID"), $repo->name, '', "data-app='{$app->openApp}'"); - $paths = explode('/', $entry); - $fileName = array_pop($paths); - $postPath = ''; + $paths = explode('/', $entry); + $fileName = array_pop($paths); + $postPath = ''; + $base64BranchID = base64_encode($branchID); foreach($paths as $pathName) { $postPath .= $pathName . '/'; - echo '/' . ' ' . html::a($this->repo->createLink('browse', "repoID=$repoID&branchID=$branchID&objectID=$objectID&path=" . $this->repo->encodePath($postPath)), trim($pathName, '/'), '', "data-app='{$app->openApp}'"); + echo '/' . ' ' . html::a($this->repo->createLink('browse', "repoID=$repoID&branchID=$base64BranchID&objectID=$objectID&path=" . $this->repo->encodePath($postPath)), trim($pathName, '/'), '', "data-app='{$app->openApp}'"); } echo '/' . ' ' . $fileName; if(strpos($repo->SCM, 'Subversion') === false) diff --git a/module/repo/view/revision.html.php b/module/repo/view/revision.html.php index 8da20df320..ffe68e3566 100644 --- a/module/repo/view/revision.html.php +++ b/module/repo/view/revision.html.php @@ -19,7 +19,7 @@ $typeInfo = $type == 'file' ? '&type=file' : '';