From 21a11d8d09508f88b02acbe5ac764a54bc80a124 Mon Sep 17 00:00:00 2001 From: zhujinyong Date: Tue, 23 Mar 2021 17:43:04 +0800 Subject: [PATCH] + Add objectID param in doc module. --- module/doc/control.php | 15 +--- module/doc/view/objectlibs.html.php | 16 ++-- module/program/view/browsebylist.html.php | 2 +- module/repo/control.php | 91 ++++++++++++++--------- module/repo/model.php | 7 +- module/repo/view/blame.html.php | 6 +- module/repo/view/browse.html.php | 8 +- module/repo/view/maintain.html.php | 10 +-- module/repo/view/revision.html.php | 2 +- module/repo/view/view.html.php | 14 ++-- 10 files changed, 90 insertions(+), 81 deletions(-) diff --git a/module/doc/control.php b/module/doc/control.php index 7efa8d6cdf..9abd9fffde 100644 --- a/module/doc/control.php +++ b/module/doc/control.php @@ -851,23 +851,15 @@ class doc extends control */ public function objectLibs($type, $objectID) { - $from = $this->app->openApp; - setcookie('from', $from, $this->config->cookieLife, $this->config->webRoot, '', false, true); + // setcookie('from', $from, $this->config->cookieLife, $this->config->webRoot, '', false, true); $this->session->set('docList', $this->app->getURI(true)); $table = $type == 'product' ? TABLE_PRODUCT : TABLE_PROJECT; $object = $this->dao->select('id,name,status')->from($table)->where('id')->eq($objectID)->fetch(); if(empty($object)) $this->locate($this->createLink($type, 'create', '', '', '', $this->session->project)); - $from = $this->app->openApp; - if($from == 'execution') - { - $this->execution->setMenu($objectID); - } - else - { - $this->loadModel($from)->setMenu($objectID); - } + $openApp = $this->app->openApp; + if($openApp != 'doc') $this->loadModel($openApp)->setMenu($objectID); /* Set Custom. */ foreach(explode(',', $this->config->doc->customObjectLibs) as $libType) $customObjectLibs[$libType] = $this->lang->doc->customObjectLibs[$libType]; @@ -883,7 +875,6 @@ class doc extends control $this->view->type = $type; $this->view->object = $object; - $this->view->from = $from; $this->view->libs = $this->doc->getLibsByObject($type, $objectID); $this->view->canBeChanged = common::canModify($type, $object); // Determines whether an object is editable. $this->display(); diff --git a/module/doc/view/objectlibs.html.php b/module/doc/view/objectlibs.html.php index 8d59d06fde..9788f087ea 100644 --- a/module/doc/view/objectlibs.html.php +++ b/module/doc/view/objectlibs.html.php @@ -12,10 +12,10 @@ ?> doc->appendNavCSS();?> -from == 'execution'):;?> +openApp == 'execution'):;?> -
+
from == 'doc'):?> @@ -27,7 +27,7 @@
- from == 'doc' ? $object->name : $object->name . $lang->doc->common;?> + openApp == 'doc' ? $object->name : $object->name . $lang->doc->common;?>
", '', "title='{$lang->doc->browseTypeList['grid']}' class='btn btn-icon text-primary'");?> ", '', "title='{$lang->doc->browseTypeList['list']}' class='btn btn-icon'");?> @@ -37,19 +37,19 @@
$lib):?> - + openApp != 'doc') continue;?> doc->custom->objectLibs, 'files') === false && $libID == 'files') continue;?> doc->custom->objectLibs, 'customFiles') === false && isset($lib->main) && !$lib->main) continue;?> - + id");?> - id&from=$from");?> + id");?>
- > +
collector, $this->app->user->account) !== false ? " " : '') . $lib->name;?>
allCount . $lang->doc->item;?>
@@ -64,7 +64,7 @@ ", '', "title='{$lang->edit}' class='btn btn-link iframe'")?> main)) common::printLink('doc', 'deleteLib', "libID=$libID", "", 'hiddenwin', "title='{$lang->delete}' class='btn btn-link'")?> - ", '', "title='{$lang->doc->manageType}' class='btn btn-link'")?> + ", '', "title='{$lang->doc->manageType}' class='btn btn-link'")?>
diff --git a/module/program/view/browsebylist.html.php b/module/program/view/browsebylist.html.php index f87daa05b9..810b60bcf5 100644 --- a/module/program/view/browsebylist.html.php +++ b/module/program/view/browsebylist.html.php @@ -5,7 +5,7 @@ - + program->name;?> program->PM);?> diff --git a/module/repo/control.php b/module/repo/control.php index f462a73aa4..d0f2ad0812 100644 --- a/module/repo/control.php +++ b/module/repo/control.php @@ -20,6 +20,8 @@ class repo extends control { parent::__construct(); + $this->scm = $this->app->loadClass('scm'); + $disFuncs = str_replace(' ', '', ini_get('disable_functions')); if(stripos(",$disFuncs,", ',exec,') !== false or stripos(",$disFuncs,", ',shell_exec,') !== false) { @@ -34,16 +36,15 @@ class repo extends control /** * Common actions. * - * @param int $objectID projectID|executionID * @param int $repoID + * @param int $objectID projectID|executionID * @access public * @return void */ - public function commonAction($objectID, $repoID = 0) + public function commonAction($repoID = 0, $objectID = 0) { $openApp = $this->app->openApp; $this->repos = $this->repo->getRepoPairs($openApp, $objectID); - $this->scm = $this->app->loadClass('scm'); if($openApp == 'project') { @@ -64,6 +65,7 @@ class repo extends control /** * List all repo. * + * @param int $objectID * @param string $orderBy * @param int $recTotal * @param int $recPerPage @@ -71,10 +73,8 @@ class repo extends control * @access public * @return void */ - public function maintain($orderBy = 'id_desc', $recTotal = 0, $recPerPage = 20, $pageID = 1) + public function maintain($objectID = 0, $orderBy = 'id_desc', $recTotal = 0, $recPerPage = 20, $pageID = 1) { - $repoID = $this->session->repoID; - $this->commonAction($repoID); $this->lang->switcherMenu = ''; if(common::hasPriv('repo', 'create')) $this->lang->TRActions = html::a(helper::createLink('repo', 'create'), " " . $this->lang->repo->create, '', "class='btn btn-primary'"); @@ -90,11 +90,11 @@ class repo extends control $this->view->position[] = $this->lang->repo->common; $this->view->position[] = $this->lang->repo->browse; - $this->view->repoID = $repoID; - $this->view->orderBy = $orderBy; - $this->view->pager = $pager; - $this->view->repoList = empty($repoList) ? $repoList: $repoList[$pageID - 1];; - $this->view->products = $this->loadModel('product')->getPairs(); + $this->view->orderBy = $orderBy; + $this->view->objectID = $objectID; + $this->view->pager = $pager; + $this->view->repoList = empty($repoList) ? $repoList: $repoList[$pageID - 1];; + $this->view->products = $this->loadModel('product')->getPairs(); $this->display(); } @@ -106,7 +106,7 @@ class repo extends control * @access public * @return void */ - public function create($objectID) + public function create($objectID = 0) { if($_POST) { @@ -114,11 +114,11 @@ class repo extends control if(dao::isError()) $this->send(array('result' => 'fail', 'message' => dao::getError())); - $link = $this->repo->createLink('showSyncCommit', "repoID=$repoID", '', false, $this->projectID); + $link = $this->repo->createLink('showSyncCommit', "repoID=$repoID&objectID=$objectID", '', false); $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => $link)); } - $this->commonAction($objectID); + $this->commonAction(0, $objectID); $this->app->loadLang('action'); $this->repo->setMenu($this->repos, '', false); @@ -136,11 +136,14 @@ class repo extends control * Edit a repo. * * @param int $repoID + * @param int $objectID * @access public * @return void */ - public function edit($repoID) + public function edit($repoID, $objectID = 0) { + $this->commonAction($repoID, $objectID); + $repo = $this->repo->getRepoByID($repoID); if($_POST) { @@ -161,9 +164,10 @@ class repo extends control $repo->repoType = $repo->id . '-' . $repo->SCM; $this->view->repo = $repo; $this->view->repoID = $repoID; + $this->view->objectID = $objectID; $this->view->groups = $this->loadModel('group')->getPairs(); $this->view->users = $this->loadModel('user')->getPairs('noletter|noempty|nodeleted'); - $this->view->products = $this->projectID ? $this->loadModel('product')->getProductPairsByProject($this->projectID) : $this->loadModel('product')->getPairs(); + $this->view->products = $objectID ? $this->loadModel('product')->getProductPairsByProject($objectID) : $this->loadModel('product')->getPairs(); $this->view->title = $this->lang->repo->common . $this->lang->colon . $this->lang->repo->edit; $this->view->position[] = html::a(inlink('maintain'), $this->lang->repo->common); @@ -176,15 +180,16 @@ class repo extends control * Delete repo. * * @param int $repoID + * @param int $objectID * @param string $confirm * @access public * @return void */ - public function delete($repoID, $confirm = 'no') + public function delete($repoID, $objectID = 0, $confirm = 'no') { if($confirm == 'no') { - die(js::confirm($this->lang->repo->notice->delete, $this->repo->createLink('delete', "repoID=$repoID&confirm=yes"))); + die(js::confirm($this->lang->repo->notice->delete, $this->repo->createLink('delete', "repoID=$repoID&objectID=$objectID&confirm=yes"))); } $relationID = $this->dao->select('id')->from(TABLE_RELATION)->where('extra')->eq($repoID)->fetch(); @@ -206,6 +211,7 @@ class repo extends control * View repo file. * * @param int $repoID + * @param int $objectID * @param string $entry * @param string $revision * @param string $showBug @@ -213,8 +219,10 @@ class repo extends control * @access public * @return void */ - public function view($repoID, $entry, $revision = 'HEAD', $showBug = 'false', $encoding = '') + public function view($repoID, $objectID = 0, $entry = '', $revision = 'HEAD', $showBug = 'false', $encoding = '') { + $this->commonAction($repoID, $objectID); + if($this->get->repoPath) $entry = $this->get->repoPath; $this->repo->setMenu($this->repos, $repoID); $this->repo->setBackSession('view', $withOtherModule = true); @@ -282,6 +290,7 @@ class repo extends control $this->view->showBug = $showBug; $this->view->encoding = str_replace('-', '_', $encoding); $this->view->repoID = $repoID; + $this->view->objectID = $objectID; $this->view->repo = $repo; $this->view->revision = $revision; $this->view->revisionName = $revisionName; @@ -306,18 +315,16 @@ class repo extends control * * @param int $repoID * @param int $objectID + * @param string $path * @param string $revision * @param int $refresh * @access public * @return void */ - public function browse($repoID = 0, $objectID = 0, $revision = 'HEAD', $refresh = 0) + public function browse($repoID = 0, $objectID = 0, $path = '', $revision = 'HEAD', $refresh = 0) { - $this->commonAction($objectID); + $this->commonAction($repoID, $objectID); - /* Get path and refresh. */ - $path = ''; - if($this->get->repoPath) $path = $this->get->repoPath; if(empty($refresh) and $this->cookie->repoRefresh) $refresh = $this->cookie->repoRefresh; /* Set menu and session. */ @@ -343,7 +350,7 @@ class repo extends control $oldRevision = isset($this->post->revision[1]) ? $this->post->revision[1] : ''; $newRevision = isset($this->post->revision[0]) ? $this->post->revision[0] : ''; - $this->locate($this->repo->createLink('diff', "repoID=$repoID&entry=" . $this->repo->encodePath($path) . "&oldrevision=$oldRevision&newRevision=$newRevision")); + $this->locate($this->repo->createLink('diff', "repoID=$repoID&objectID=$objectID&entry=" . $this->repo->encodePath($path) . "&oldrevision=$oldRevision&newRevision=$newRevision")); } /* Cache infos. */ @@ -410,6 +417,7 @@ class repo extends control $this->view->revision = $revision; $this->view->infos = $infos; $this->view->repoID = $repoID; + $this->view->objectID = $objectID; $this->view->pager = $pager; $this->view->path = urldecode($path); $this->view->logType = $logType; @@ -477,6 +485,7 @@ class repo extends control * Show repo revision. * * @param int $repoID + * @param int $objectID * @param int $revision * @param string $root * @param string $type @@ -484,11 +493,8 @@ class repo extends control * @access public * @return void */ - public function revision($repoID, $revision, $root = '', $type = 'dir') + public function revision($repoID, $objectID = 0, $revision, $root = '', $type = 'dir') { - if($this->get->repoPath) $root = $this->get->repoPath; - - $this->repo->setMenu($this->repos, $repoID); $this->repo->setBackSession(); if($repoID == 0) $repoID = $this->session->repoID; $repo = $this->repo->getRepoByID($repoID); @@ -560,6 +566,7 @@ class repo extends control $this->view->type = $type; $this->view->changes = $changes; $this->view->repoID = $repoID; + $this->view->objectID = $objectID; $this->view->revision = $log[0]->revision; $this->view->parentDir = $parent; $this->view->oldRevision = $oldRevision; @@ -576,14 +583,17 @@ class repo extends control * Blame repo file. * * @param int $repoID + * @param int $objectID * @param string $entry * @param string $revision * @param string $encoding * @access public * @return void */ - public function blame($repoID, $entry, $revision = 'HEAD', $encoding = '') + public function blame($repoID, $objectID = 0, $entry = '', $revision = 'HEAD', $encoding = '') { + $this->commonAction($repoID, $objectID); + if($this->get->repoPath) $entry = $this->get->repoPath; $this->repo->setMenu($this->repos, $repoID); if($repoID == 0) $repoID = $this->session->repoID; @@ -606,6 +616,7 @@ class repo extends control $this->view->title = $this->lang->repo->common; $this->view->repoID = $repoID; + $this->view->objectID = $objectID; $this->view->repo = $repo; $this->view->revision = $revision; $this->view->entry = $entry; @@ -621,6 +632,7 @@ class repo extends control * Show diff. * * @param int $repoID + * @param int $objectID * @param string $entry * @param string $oldRevision * @param string $newRevision @@ -629,11 +641,11 @@ class repo extends control * @access public * @return void */ - public function diff($repoID, $entry = '', $oldRevision = '0', $newRevision = 'HEAD', $showBug = 'false', $encoding = '') + public function diff($repoID, $objectID = 0, $entry = '', $oldRevision = '0', $newRevision = 'HEAD', $showBug = 'false', $encoding = '') { + $this->commonAction($repoID, $objectID); + if($this->get->repoPath) $entry = $this->get->repoPath; - $this->repo->setMenu($this->repos, $repoID); - if($repoID == 0) $repoID = $this->session->repoID; $file = $entry; $repo = $this->repo->getRepoByID($repoID); $entry = $this->repo->decodePath($entry); @@ -655,7 +667,7 @@ class repo extends control } if($this->post->encoding) $encoding = $this->post->encoding; - $this->locate($this->repo->createLink('diff', "repoID=$repoID&entry=" . $this->repo->encodePath($entry) . "&oldrevision=$oldRevision&newRevision=$newRevision&showBug=&encoding=$encoding")); + $this->locate($this->repo->createLink('diff', "repoID=$repoID&objectID=$objectID&entry=" . $this->repo->encodePath($entry) . "&oldrevision=$oldRevision&newRevision=$newRevision&showBug=&encoding=$encoding")); } $this->scm->setEngine($repo); @@ -708,6 +720,7 @@ class repo extends control $this->view->suffix = $suffix; $this->view->file = $file; $this->view->repoID = $repoID; + $this->view->objectID = $objectID; $this->view->repo = $repo; $this->view->encoding = str_replace('-', '_', $encoding); $this->view->arrange = $arrange; @@ -782,12 +795,15 @@ class repo extends control * Show sync comment. * * @param int $repoID + * @param int $objectID projectID|executionID * @param string $branch * @access public * @return void */ - public function showSyncCommit($repoID = 0, $branch = '') + public function showSyncCommit($repoID = 0, $objectID = 0, $branch = '') { + $this->commonAction($repoID, $objectID); + $this->repo->setMenu($this->repos, $repoID); if($repoID == 0) $repoID = $this->session->repoID; if($branch) $branch = base64_decode($branch); @@ -798,8 +814,9 @@ class repo extends control $latestInDB = $this->repo->getLatestCommit($repoID); $this->view->version = $latestInDB ? (int)$latestInDB->commit : 1; $this->view->repoID = $repoID; + $this->view->objectID = $objectID; $this->view->branch = $branch; - $this->view->browseLink = $this->repo->createLink('browse', "repoID=$repoID", '', false, $this->projectID); + $this->view->browseLink = $this->repo->createLink('browse', "repoID=$repoID&objectID=$objectID", '', false); $this->display(); } @@ -813,6 +830,8 @@ class repo extends control */ public function ajaxSyncCommit($repoID = 0, $type = 'batch') { + $this->commonAction($repoID); + set_time_limit(0); $repo = $this->repo->getRepoByID($repoID); if(empty($repo)) die(); diff --git a/module/repo/model.php b/module/repo/model.php index 08a046df84..ed9f5202e8 100644 --- a/module/repo/model.php +++ b/module/repo/model.php @@ -824,13 +824,12 @@ class repoModel extends model * @param string $params * @param string $viewType * @param bool $onlybody - * @param int $projectID * @access public * @return string */ - public function createLink($method, $params = '', $viewType = '', $onlybody = false, $projectID = 0) + public function createLink($method, $params = '', $viewType = '', $onlybody = false) { - if($this->config->requestType == 'GET') return helper::createLink('repo', $method, $params, $viewType, $onlybody, $projectID); + if($this->config->requestType == 'GET') return helper::createLink('repo', $method, $params, $viewType, $onlybody); $parsedParams = array(); parse_str($params, $parsedParams); @@ -847,7 +846,7 @@ class repoModel extends model } $params = http_build_query($parsedParams); - $link = helper::createLink('repo', $method, $params, $viewType, $onlybody, $projectID); + $link = helper::createLink('repo', $method, $params, $viewType, $onlybody); if(empty($pathParams)) return $link; $link .= strpos($link, '?') === false ? '?' : '&'; diff --git a/module/repo/view/blame.html.php b/module/repo/view/blame.html.php index 56d8991a5e..fb2b0c2ac7 100644 --- a/module/repo/view/blame.html.php +++ b/module/repo/view/blame.html.php @@ -31,14 +31,14 @@ css::import($jsRoot . 'misc/highlight/styles/github.css');
repo->createLink('browse', "repoID=$repoID"), $repo->name); + echo html::a($this->repo->createLink('browse', "repoID=$repoID&objectID=$objectID"), $repo->name); $paths= explode('/', $entry); $fileName = array_pop($paths); $postPath = ''; foreach($paths as $pathName) { $postPath .= $pathName . '/'; - echo '/' . ' ' . html::a($this->repo->createLink('browse', "repoID=$repoID&path=" . $this->repo->encodePath($postPath)), trim($pathName, '/')); + echo '/' . ' ' . html::a($this->repo->createLink('browse', "repoID=$repoID&objectID=$objectID&path=" . $this->repo->encodePath($postPath)), trim($pathName, '/')); } echo '/' . ' ' . $fileName; echo " " . $revisionName . ''; @@ -58,7 +58,7 @@ css::import($jsRoot . 'misc/highlight/styles/github.css'); repo->encodingList, $encoding, $lang->repo->encoding) . "", "id='encoding' data-toggle='dropdown'", 'btn dropdown-toggle')?>
diff --git a/module/repo/view/browse.html.php b/module/repo/view/browse.html.php index 690787c432..2a580ac582 100644 --- a/module/repo/view/browse.html.php +++ b/module/repo/view/browse.html.php @@ -14,7 +14,7 @@
repo->createLink('browse', "repoID=$repoID"), $repo->name); + echo html::a($this->repo->createLink('browse', "repoID=$repoID&objectID=$objectID"), $repo->name); if(!empty($path)) { $paths = explode('/', $path); @@ -22,7 +22,7 @@ foreach($paths as $pathName) { $postPath .= $pathName . '/'; - echo '/' . ' ' . html::a($this->repo->createLink('browse', "repoID=$repoID&path=" . $this->repo->encodePath($postPath) . "&revision=$revision"), trim($pathName, '/')); + echo '/' . ' ' . html::a($this->repo->createLink('browse', "repoID=$repoID&objectID=$objectID&path=" . $this->repo->encodePath($postPath) . "&revision=$revision"), trim($pathName, '/')); } } ?> @@ -31,7 +31,7 @@
repo->notice->lastSyncTime . $cacheTime?> - repo->createLink('browse', "repoID=$repoID&path=" . $this->repo->encodePath($path) . "&revision=$revision&refresh=1"), " ". $lang->refresh, '', "class='btn btn-primary'");?> + repo->createLink('browse', "repoID=$repoID&objectID=$objectID&path=" . $this->repo->encodePath($path) . "&revision=$revision&refresh=1"), " ". $lang->refresh, '', "class='btn btn-primary'");?>
@@ -57,7 +57,7 @@ name, '/'); - $link = $info->kind == 'dir' ? $this->repo->createLink('browse', "repoID=$repoID&path=" . $this->repo->encodePath($infoPath)) : $this->repo->createLink('view', "repoID=$repoID&entry=" . $this->repo->encodePath($infoPath)); + $link = $info->kind == 'dir' ? $this->repo->createLink('browse', "repoID=$repoID&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}'"); ?> diff --git a/module/repo/view/maintain.html.php b/module/repo/view/maintain.html.php index 0c158fbc4f..68f53d10d0 100644 --- a/module/repo/view/maintain.html.php +++ b/module/repo/view/maintain.html.php @@ -26,11 +26,11 @@ - $repo):?> + - + id; ?> repo->scmList, $repo->SCM); ?> - createLink('repo', 'browse', "repoID={$repo->id}"), $repo->name);?> + createLink('repo', 'browse', "repoID={$repo->id}&objectID=$objectID"), $repo->name);?> product)); @@ -43,8 +43,8 @@ path; ?> createLink('repo', 'delete', "repoID=$id"), '', 'hiddenwin', "title='{$lang->repo->delete}' class='btn'"); + common::printIcon('repo', 'edit', "repoID=$repo->id&objectID=$objectID", '', 'list', 'edit'); + if(common::hasPriv('repo', 'delete')) echo html::a($this->createLink('repo', 'delete', "repoID=$repo->id&objectID=$objectID"), '', 'hiddenwin', "title='{$lang->repo->delete}' class='btn'"); ?> diff --git a/module/repo/view/revision.html.php b/module/repo/view/revision.html.php index 02c605ab28..9c403e74a8 100644 --- a/module/repo/view/revision.html.php +++ b/module/repo/view/revision.html.php @@ -34,7 +34,7 @@ $typeInfo = $type == 'file' ? '&type=file' : '';
repo->changes;?> -
repo->createLink('diff', "repoID=$repoID&entry=&fromRevision=$oldRevision&toRevision=$revision"), $lang->repo->diffAll);?>
+
repo->createLink('diff', "repoID=$repoID&objectID=$objectID&entry=&fromRevision=$oldRevision&toRevision=$revision"), $lang->repo->diffAll);?>
diff --git a/module/repo/view/view.html.php b/module/repo/view/view.html.php index c83369e389..88cf3b496f 100644 --- a/module/repo/view/view.html.php +++ b/module/repo/view/view.html.php @@ -25,14 +25,14 @@ $version = " $revisionName";
repo->createLink('browse', "repoID=$repoID"), $repo->name); + echo html::a($this->repo->createLink('browse', "repoID=$repoID&objectID=$objectID"), $repo->name); $paths= explode('/', $entry); $fileName = array_pop($paths); $postPath = ''; foreach($paths as $pathName) { $postPath .= $pathName . '/'; - echo '/' . ' ' . html::a($this->repo->createLink('browse', "repoID=$repoID&path=" . $this->repo->encodePath($postPath)), trim($pathName, '/')); + echo '/' . ' ' . html::a($this->repo->createLink('browse', "repoID=$repoID&objectID=$objectID&path=" . $this->repo->encodePath($postPath)), trim($pathName, '/')); } echo '/' . ' ' . $fileName; echo $version; @@ -41,7 +41,7 @@ $version = " $revisionName";
- repo->createLink('revision', "repoID=$repoID&revision=$revision"), $lang->repo->allChanges, '', "class='btn btn-primary'")?> + repo->createLink('revision', "repoID=$repoID&objectID=$objectID&revision=$revision"), $lang->repo->allChanges, '', "class='btn btn-primary'")?>
@@ -56,7 +56,7 @@ $version = " $revisionName";
repo->images, "|$suffix|") === false):?> repo->createLink('blame', "repoID=$repoID&entry=$encodePath&revision=$revision&encoding=$encoding"), html::icon('random') . $lang->repo->blame, '', "class='btn btn-sm btn-primary'"); + if(common::hasPriv('repo', 'blame')) echo html::a($this->repo->createLink('blame', "repoID=$repoID&objectID=$objectID&entry=$encodePath&revision=$revision&encoding=$encoding"), html::icon('random') . $lang->repo->blame, '', "class='btn btn-sm btn-primary'"); if(common::hasPriv('repo', 'download')) echo html::a($this->repo->createLink('download', "repoID=$repoID&path=$encodePath&fromRevision=$revision"), html::icon('download-alt') . $lang->repo->download, 'hiddenwin', "class='btn btn-sm btn-primary'"); ?> @@ -64,7 +64,7 @@ $version = " $revisionName"; repo->encodingList, $encoding, $lang->repo->encoding) . "", "id='encoding' data-toggle='dropdown'", 'btn btn-sm btn-primary dropdown-toggle')?>
@@ -91,8 +91,8 @@ $version = " $revisionName";