diff --git a/module/bug/model.php b/module/bug/model.php
index b29d5bc181..e944d9c8ef 100644
--- a/module/bug/model.php
+++ b/module/bug/model.php
@@ -36,25 +36,25 @@ class bugModel extends model
if($isMobile)
{
$this->app->loadLang('qa');
- $pageNav = html::a(helper::createLink('qa', 'index'), $this->lang->qa->index) . $this->lang->colon;
+ $pageNav = html::a(helper::createLink('qa', 'index', '', '', '', $this->session->program), $this->lang->qa->index) . $this->lang->colon;
}
else
{
if($this->config->global->flow == 'full')
{
$this->app->loadLang('qa');
- $pageNav = '
' . html::a(helper::createLink('qa', 'index', 'locate=no'), $this->lang->qa->index, '', "class='btn'") . '
';
+ $pageNav = '' . html::a(helper::createLink('qa', 'index', 'locate=no', '', '', $this->session->program), $this->lang->qa->index, '', "class='btn'") . '
';
}
else
{
if(common::hasPriv('bug', 'report'))
{
- $link = helper::createLink('bug', 'report', "productID=$productID&browseType=$browseType&branchID=$branch&moduleID=$moduleID");
+ $link = helper::createLink('bug', 'report', "productID=$productID&browseType=$browseType&branchID=$branch&moduleID=$moduleID", '', '', $this->session->program);
$pageActions .= html::a($link, " " . $this->lang->bug->report->common . '', '', "class='btn btn-link'");
}
if(common::hasPriv('bug', 'export'))
{
- $link = helper::createLink('bug', 'export', "productID=$productID&orderBy=$orderBy");
+ $link = helper::createLink('bug', 'export', "productID=$productID&orderBy=$orderBy", '', '', $this->session->program);
$pageActions .= "";
$pageActions .= "";
@@ -66,20 +66,20 @@ class bugModel extends model
}
if(common::hasPriv('bug', 'batchCreate'))
{
- $link = helper::createLink('bug', 'batchCreate', "productID=$productID&branch=$branch&projectID=0&moduleID=$moduleID");
+ $link = helper::createLink('bug', 'batchCreate', "productID=$productID&branch=$branch&projectID=0&moduleID=$moduleID", '', '', $this->session->program);
$pageActions .= html::a($link, "" . $this->lang->bug->batchCreate, '', "class='btn btn-secondary'");
}
if(commonModel::isTutorialMode())
{
$wizardParams = helper::safe64Encode("productID=$productID&branch=$branch&extra=moduleID=$moduleID");
- $link = helper::createLink('tutorial', 'wizard', "module=bug&method=create¶ms=$wizardParams");
+ $link = helper::createLink('tutorial', 'wizard', "module=bug&method=create¶ms=$wizardParams", '', '', $this->session->program);
$pageActions .= html::a($link, "" . $this->lang->bug->create, '', "class='btn btn-primary btn-bug-create'");
}
else
{
if(common::hasPriv('bug', 'create'))
{
- $link = helper::createLink('bug', 'create', "productID=$productID&branch=$branch&extra=moduleID=$moduleID");
+ $link = helper::createLink('bug', 'create', "productID=$productID&branch=$branch&extra=moduleID=$moduleID", '', '', $this->session->program);
$pageActions .= html::a($link, "" . $this->lang->bug->create, '', "class='btn btn-primary'");
}
}
@@ -135,6 +135,7 @@ class bugModel extends model
{
$now = helper::now();
$bug = fixer::input('post')
+ ->setDefault('program', $this->session->program)
->setDefault('openedBy', $this->app->user->account)
->setDefault('openedDate', $now)
->setDefault('project,story,task', 0)
@@ -285,6 +286,7 @@ class bugModel extends model
}
}
+ $bug->program = $this->session->program;
$this->dao->insert(TABLE_BUG)->data($bug)
->autoCheck()
->batchCheck($this->config->bug->create->requiredFields, 'notempty')
@@ -415,7 +417,7 @@ class bugModel extends model
{
echo(js::alert($this->lang->bug->projectAccessDenied));
$loginLink = $this->config->requestType == 'GET' ? "?{$this->config->moduleVar}=user&{$this->config->methodVar}=login" : "user{$this->config->requestFix}login";
- if(strpos($this->server->http_referer, $loginLink) !== false) die(js::locate(helper::createLink('bug', 'index')));
+ if(strpos($this->server->http_referer, $loginLink) !== false) die(js::locate(helper::createLink('bug', 'index', '', '', '', $this->session->program)));
die(js::locate('back'));
}
}
@@ -2476,7 +2478,7 @@ class bugModel extends model
}
}
- $bugLink = inlink('view', "bugID=$bug->id");
+ $bugLink = helper::createLink('bug', 'view', "bugID=$bug->id", '', '', $this->session->program);
$account = $this->app->user->account;
$id = $col->id;
if($col->show)
@@ -2517,7 +2519,7 @@ class bugModel extends model
case 'id':
if($canBatchAction)
{
- echo html::checkbox('bugIDList', array($bug->id => '')) . html::a(helper::createLink('bug', 'view', "bugID=$bug->id"), sprintf('%03d', $bug->id));
+ echo html::checkbox('bugIDList', array($bug->id => '')) . html::a(helper::createLink('bug', 'view', "bugID=$bug->id", '', '', $this->session->program), sprintf('%03d', $bug->id));
}
else
{
@@ -2561,14 +2563,14 @@ class bugModel extends model
if(isset($stories[$bug->story]))
{
$story = $stories[$bug->story];
- echo common::hasPriv('story', 'view') ? html::a(helper::createLink('story', 'view', "storyID=$story->id", 'html', true), $story->title, '', "class='iframe'") : $story->title;
+ echo common::hasPriv('story', 'view') ? html::a(helper::createLink('story', 'view', "storyID=$story->id", 'html', true, $this->session->program), $story->title, '', "class='iframe'") : $story->title;
}
break;
case 'task':
if(isset($tasks[$bug->task]))
{
$task = $tasks[$bug->task];
- echo common::hasPriv('task', 'view') ? html::a(helper::createLink('task', 'view', "taskID=$task->id", 'html', true), $task->name, '', "class='iframe'") : $task->name;
+ echo common::hasPriv('task', 'view') ? html::a(helper::createLink('task', 'view', "taskID=$task->id", 'html', true, $this->session->program), $task->name, '', "class='iframe'") : $task->name;
}
break;
case 'type':
@@ -2623,7 +2625,7 @@ class bugModel extends model
}
elseif($buildID and common::hasPriv('build', 'view'))
{
- echo html::a(helper::createLink('build', 'view', "buildID=$buildID"), $build, '', "title='$bug->openedBuild'");
+ echo html::a(helper::createLink('build', 'view', "buildID=$buildID", '', '', $this->session->program), $build, '', "title='$bug->openedBuild'");
}
else
{
@@ -2666,11 +2668,11 @@ class bugModel extends model
break;
case 'actions':
$params = "bugID=$bug->id";
- common::printIcon('bug', 'confirmBug', $params, $bug, 'list', 'confirm', '', 'iframe', true);
- common::printIcon('bug', 'resolve', $params, $bug, 'list', 'checked', '', 'iframe', true);
- common::printIcon('bug', 'close', $params, $bug, 'list', '', '', 'iframe', true);
- common::printIcon('bug', 'edit', $params, $bug, 'list');
- common::printIcon('bug', 'create', "product=$bug->product&branch=$bug->branch&extra=$params", $bug, 'list', 'copy');
+ common::printIcon('bug', 'confirmBug', $params, $bug, 'list', 'confirm', '', 'iframe', true, '', '', $this->session->program);
+ common::printIcon('bug', 'resolve', $params, $bug, 'list', 'checked', '', 'iframe', true, '', '', $this->session->program);
+ common::printIcon('bug', 'close', $params, $bug, 'list', '', '', 'iframe', true, '', '', $this->session->program);
+ common::printIcon('bug', 'edit', $params, $bug, 'list', '', '', '', '', '', '', $this->session->program);
+ common::printIcon('bug', 'create', "product=$bug->product&branch=$bug->branch&extra=$params", $bug, 'list', 'copy', '', '', '', '', '', $this->session->program);
break;
}
echo '';
@@ -2695,7 +2697,7 @@ class bugModel extends model
$btnClass = $bug->assignedTo == 'closed' ? ' disabled' : '';
$btnClass = "iframe btn btn-icon-left btn-sm {$btnClass}";
- $assignToLink = helper::createLink('bug', 'assignTo', "bugID=$bug->id", '', true);
+ $assignToLink = helper::createLink('bug', 'assignTo', "bugID=$bug->id", '', true, $this->session->program);
$assignToHtml = html::a($assignToLink, " {$assignedToText}", '', "class='$btnClass'");
echo !common::hasPriv('bug', 'assignTo', $bug) ? "{$assignedToText}" : $assignToHtml;
@@ -2727,7 +2729,7 @@ class bugModel extends model
if($id)
{
$name = $this->dao->select('title')->from(TABLE_BUG)->where('id')->eq($id)->fetch('title');
- if($name) $action->appendLink = html::a(zget($this->config->mail, 'domain', common::getSysURL()) . helper::createLink($action->objectType, 'view', "id=$id", 'html'), "#$id " . $name);
+ if($name) $action->appendLink = html::a(zget($this->config->mail, 'domain', common::getSysURL()) . helper::createLink($action->objectType, 'view', "id=$id", 'html', '', $this->session->program), "#$id " . $name);
}
}
diff --git a/module/bug/view/browse.html.php b/module/bug/view/browse.html.php
index 1adb46068f..e3b4972fd6 100644
--- a/module/bug/view/browse.html.php
+++ b/module/bug/view/browse.html.php
@@ -36,7 +36,7 @@ $currentBrowseType = isset($lang->bug->mySelects[$browseType]) && in_array($brow
echo $moduleName;
if($moduleID)
{
- $removeLink = $browseType == 'bymodule' ? inlink('browse', "productID=$productID&branch=$branch&browseType=$browseType¶m=0&orderBy=$orderBy&recTotal=0&recPerPage={$pager->recPerPage}") : 'javascript:removeCookieByKey("bugModule")';
+ $removeLink = $browseType == 'bymodule' ? $this->createLink('bug', 'browse', "productID=$productID&branch=$branch&browseType=$browseType¶m=0&orderBy=$orderBy&recTotal=0&recPerPage={$pager->recPerPage}", '', '', $this->session->program) : 'javascript:removeCookieByKey("bugModule")';
echo html::a($removeLink, "", '', "class='text-muted'");
}
?>
@@ -62,13 +62,13 @@ $currentBrowseType = isset($lang->bug->mySelects[$browseType]) && in_array($brow
foreach($lang->bug->mySelects as $key => $value)
{
echo '
';
- echo html::a($this->createLink('bug', 'browse', "productid=$productID&branch=$branch&browseType=$key"), $value);
+ echo html::a($this->createLink('bug', 'browse', "productid=$productID&branch=$branch&browseType=$key", '', '', $this->session->program), $value);
}
echo '';
}
elseif($menuItem->name == 'QUERY')
{
- $searchBrowseLink = inlink('browse', "productID=$productID&branch=$branch&browseType=bySearch¶m=%s");
+ $searchBrowseLink = $this->createLink('bug', 'browse', "productID=$productID&branch=$branch&browseType=bySearch¶m=%s", '', '', $this->session->program);
$isBySearch = $browseType == 'bysearch';
include '../../common/view/querymenu.html.php';
}
@@ -88,14 +88,14 @@ $currentBrowseType = isset($lang->bug->mySelects[$browseType]) && in_array($brow
foreach($lang->bug->moreSelects as $menuBrowseType => $label)
{
$active = $menuBrowseType == $browseType ? 'btn-active-text' : '';
- echo '' . html::a($this->createLink('bug', 'browse', "productid=$productID&branch=$branch&browseType=$menuBrowseType"), "{$label}", '', "class='btn btn-link $active'") . '';
+ echo '' . html::a($this->createLink('bug', 'browse', "productid=$productID&branch=$branch&browseType=$menuBrowseType", '', '', $this->session->program), "{$label}", '', "class='btn btn-link $active'") . '';
}
echo '';
}
}
else
{
- echo html::a($this->createLink('bug', 'browse', "productid=$productID&branch=$branch&browseType=$menuBrowseType"), $label, '', "class='btn btn-link $active'");
+ echo html::a($this->createLink('bug', 'browse', "productid=$productID&branch=$branch&browseType=$menuBrowseType", '', '', $this->session->program), $label, '', "class='btn btn-link $active'");
}
}
?>
@@ -111,22 +111,22 @@ $currentBrowseType = isset($lang->bug->mySelects[$browseType]) && in_array($brow
createLink('bug', 'export', "productID=$productID&orderBy=$orderBy&browseType=$browseType") : '#';
+ $link = common::hasPriv('bug', 'export') ? $this->createLink('bug', 'export', "productID=$productID&orderBy=$orderBy&browseType=$browseType", '', '', $this->session->program) : '#';
echo "" . html::a($link, $lang->bug->export, '', $misc) . "";
?>
" . $lang->bug->batchCreate, '', "class='btn btn-secondary'");
+ common::printLink('bug', 'batchCreate', "productID=$productID&branch=$branch&projectID=0&moduleID=$moduleID", "" . $lang->bug->batchCreate, '', "class='btn btn-secondary'", '', '', '', $this->session->program);
if(commonModel::isTutorialMode())
{
$wizardParams = helper::safe64Encode("productID=$productID&branch=$branch&extra=moduleID=$moduleID");
- echo html::a($this->createLink('tutorial', 'wizard', "module=bug&method=create¶ms=$wizardParams"), "" . $lang->bug->create, '', "class='btn btn-primary btn-bug-create'");
+ echo html::a($this->createLink('tutorial', 'wizard', "module=bug&method=create¶ms=$wizardParams", '', '', $this->session->program), "" . $lang->bug->create, '', "class='btn btn-primary btn-bug-create'");
}
else
{
- common::printLink('bug', 'create', "productID=$productID&branch=$branch&extra=moduleID=$moduleID", "" . $lang->bug->create, '', "class='btn btn-primary'");
+ common::printLink('bug', 'create', "productID=$productID&branch=$branch&extra=moduleID=$moduleID", "" . $lang->bug->create, '', "class='btn btn-primary'", '', '', '', $this->session->program);
}
?>
@@ -135,12 +135,12 @@ $currentBrowseType = isset($lang->bug->mySelects[$browseType]) && in_array($brow
if(commonModel::isTutorialMode())
{
$wizardParams = helper::safe64Encode("productID=$productID&branch=$branch&extra=moduleID=$moduleID");
- $link = $this->createLink('tutorial', 'wizard', "module=bug&method=create¶ms=$wizardParams");
+ $link = $this->createLink('tutorial', 'wizard', "module=bug&method=create¶ms=$wizardParams", '', '', $this->session->program);
echo html::a($link, " {$lang->bug->create} ", '', "class='btn btn-primary btn-bug-create'");
}
else
{
- $link = $this->createLink('bug', 'create', "productID=$productID&branch=$branch&extra=moduleID=$moduleID");
+ $link = $this->createLink('bug', 'create', "productID=$productID&branch=$branch&extra=moduleID=$moduleID", '', '', $this->session->program);
$disabled = '';
if(!common::hasPriv('bug', 'create'))
{
@@ -154,7 +154,7 @@ $currentBrowseType = isset($lang->bug->mySelects[$browseType]) && in_array($brow
>
createLink('bug', 'batchCreate', "productID=$productID&branch=$branch&projectID=0&moduleID=$moduleID");
+ $batchLink = $this->createLink('bug', 'batchCreate', "productID=$productID&branch=$branch&projectID=0&moduleID=$moduleID", '', '', $this->session->program);
echo "" . html::a($batchLink, "" . $lang->bug->batchCreate) . "";
?>
@@ -175,7 +175,7 @@ $currentBrowseType = isset($lang->bug->mySelects[$browseType]) && in_array($brow
- tree->manage, '', "class='btn btn-info btn-wide'");?>
+ tree->manage, '', "class='btn btn-info btn-wide'", '', '', '', $this->session->program);?>
@@ -187,7 +187,7 @@ $currentBrowseType = isset($lang->bug->mySelects[$browseType]) && in_array($brow
bug->noBug;?>
- createLink('bug', 'create', "productID=$productID&branch=$branch&extra=moduleID=$moduleID"), " " . $lang->bug->create, '', "class='btn btn-info'");?>
+ createLink('bug', 'create', "productID=$productID&branch=$branch&extra=moduleID=$moduleID", '', '', $this->session->program), " " . $lang->bug->create, '', "class='btn btn-info'");?>
@@ -241,7 +241,7 @@ $currentBrowseType = isset($lang->bug->mySelects[$browseType]) && in_array($brow
@@ -124,7 +124,7 @@ js::set('flow', $config->global->flow);
|
- id => '')) . html::a($this->createLink('testcase', 'view', "caseID=$case->id&version=$case->version"), sprintf('%03d', $case->id));?>
+ id => '')) . html::a($this->createLink('testcase', 'view', "caseID=$case->id&version=$case->version", '', '', $this->session->program), sprintf('%03d', $case->id));?>
id);?>
@@ -132,7 +132,7 @@ js::set('flow', $config->global->flow);
| testcase->priList, $case->pri, $case->pri);?> |
module) echo "{$modulePairs[$case->module]} ";?>
- createLink('testcase', 'view', "caseID=$case->id&version=$case->version");?>
+ createLink('testcase', 'view', "caseID=$case->id&version=$case->version", '', '', $this->session->program);?>
title, null, "style='color: $case->color'");?>
|
testcase->typeList[$case->type];?> |
@@ -144,7 +144,7 @@ js::set('flow', $config->global->flow);
common::printIcon('testcase', 'edit', "caseID=$case->id", $case, 'list');
if(common::hasPriv('testcase', 'delete'))
{
- $deleteURL = $this->createLink('testcase', 'delete', "caseID=$case->id&confirm=yes");
+ $deleteURL = $this->createLink('testcase', 'delete', "caseID=$case->id&confirm=yes", '', '', $this->session->program);
echo html::a("javascript:ajaxDelete(\"$deleteURL\", \"caseList\", confirmDelete)", '', '', "title='{$lang->testcase->delete}' class='btn'");
}
?>
@@ -158,7 +158,7 @@ js::set('flow', $config->global->flow);
- createLink('testcase', 'batchEdit', "libID=$libID&branch=0&type=lib");?>
+ createLink('testcase', 'batchEdit', "libID=$libID&branch=0&type=lib", '', '', $this->session->program);?>
edit, $misc);?>
@@ -167,7 +167,7 @@ js::set('flow', $config->global->flow);
createLink('testcase', 'batchDelete', "libID=$libID");
+ $actionLink = $this->createLink('testcase', 'batchDelete', "libID=$libID", '', '', $this->session->program);
$misc = "onclick=\"confirmBatchDelete('$actionLink')\"";
echo "
" . html::a('#', $lang->delete, '', $misc) . "";
}
@@ -180,7 +180,7 @@ js::set('flow', $config->global->flow);
unset($lang->testcase->reviewResultList['']);
foreach($lang->testcase->reviewResultList as $key => $result)
{
- $actionLink = $this->createLink('testcase', 'batchReview', "result=$key");
+ $actionLink = $this->createLink('testcase', 'batchReview', "result=$key", '', '', $this->session->program);
echo '
' . html::a('#', $result, '', "onclick=\"setFormAction('$actionLink', 'hiddenwin')\"") . '';
}
echo '';
@@ -195,7 +195,7 @@ js::set('flow', $config->global->flow);
echo '
';
foreach($modules as $moduleId => $module)
{
- $actionLink = $this->createLink('testcase', 'batchChangeModule', "moduleID=$moduleId");
+ $actionLink = $this->createLink('testcase', 'batchChangeModule', "moduleID=$moduleId", '', '', $this->session->program);
echo "- " . html::a('#', $module, '', "onclick=\"setFormAction('$actionLink', 'hiddenwin')\"") . "
";
}
echo '
';
diff --git a/module/common/model.php b/module/common/model.php
index 9d5de61c3f..763c22b977 100644
--- a/module/common/model.php
+++ b/module/common/model.php
@@ -993,10 +993,10 @@ class commonModel extends model
* @access public
* @return bool
*/
- public static function printLink($module, $method, $vars = '', $label, $target = '', $misc = '', $newline = true, $onlyBody = false, $object = null)
+ public static function printLink($module, $method, $vars = '', $label, $target = '', $misc = '', $newline = true, $onlyBody = false, $object = null, $programID = 0)
{
if(!commonModel::hasPriv($module, $method, $object)) return false;
- echo html::a(helper::createLink($module, $method, $vars, '', $onlyBody), $label, $target, $misc, $newline);
+ echo html::a(helper::createLink($module, $method, $vars, '', $onlyBody, $programID), $label, $target, $misc, $newline);
return true;
}
diff --git a/module/doc/control.php b/module/doc/control.php
index 91b307fa5f..9aabe6f7ab 100644
--- a/module/doc/control.php
+++ b/module/doc/control.php
@@ -315,7 +315,7 @@ class doc extends control
if(!$docResult or dao::isError()) $this->send(array('result' => 'fail', 'message' => dao::getError()));
$docID = $docResult['id'];
- $files = $docResult['files'];
+ $files = isset($docResult['files']) ? $docResult['files'] : '';
$lib = $this->doc->getLibByID($this->post->lib);
if($docResult['status'] == 'exists')
{
diff --git a/module/doc/model.php b/module/doc/model.php
index ed6d482ef3..9771692585 100644
--- a/module/doc/model.php
+++ b/module/doc/model.php
@@ -108,7 +108,7 @@ class docModel extends model
}
$actions = $this->setFastMenu($fastLib);
- $actions .= common::hasPriv('doc', 'createLib') ? html::a(helper::createLink('doc', 'createLib', "type={$type}&objectID={$currentLib}"), "
" . $this->lang->doc->createLib, '', "class='btn btn-secondary iframe'") : '';
+ $actions .= common::hasPriv('doc', 'createLib') ? html::a(helper::createLink('doc', 'createLib', "type={$type}&objectID={$currentLib}", '', '', $this->session->program), "
" . $this->lang->doc->createLib, '', "class='btn btn-secondary iframe'") : '';
$this->lang->modulePageActions = $actions;
}
diff --git a/module/doc/view/browse.html.php b/module/doc/view/browse.html.php
index 16f0bda852..57aeaeca8a 100644
--- a/module/doc/view/browse.html.php
+++ b/module/doc/view/browse.html.php
@@ -46,9 +46,9 @@ var browseType = '';
@@ -57,7 +57,7 @@ var browseType = '';
@@ -75,7 +75,7 @@ var browseType = '';
doc->noDoc;?>
- createLink('doc', 'create', "libID={$libID}&moduleID=$moduleID"), "
" . $lang->doc->create, '', "class='btn btn-info'");?>
+ createLink('doc', 'create', "libID={$libID}&moduleID=$moduleID", '', '', $this->session->program), "
" . $lang->doc->create, '', "class='btn btn-info'");?>
doc->noEditedDoc;?>
@@ -105,17 +105,17 @@ var browseType = '';
collector, ',' . $this->app->user->account . ',') !== false ? 'icon-star text-yellow' : 'icon-star-empty';?>
collector, ',' . $this->app->user->account . ',') !== false ? $lang->doc->cancelCollection : $lang->doc->collect;?>
- | id}&browseType=all¶m=0&orderBy=$orderBy&from=$from"), " " . $lib->name);?> |
+ createLink('doc', 'browse', "libID={$lib->id}&browseType=all¶m=0&orderBy=$orderBy&from=$from", '', '', $this->session->program), " " . $lib->name);?> |
|
|
|
|
- id&objectType=doclib");?>" title="" class='btn btn-link ajaxCollect'>
+ id&objectType=doclib", '', '', $this->session->program);?>" title="" class='btn btn-link ajaxCollect'>
- id", "", '', "title='{$lang->edit}' class='btn btn-link iframe'")?>
- id&type=doc", "", '', "title='{$lang->tree->manage}' class='btn btn-link'")?>
+ id", "", '', "title='{$lang->edit}' class='btn btn-link iframe'", '', '', '', $this->session->program)?>
+ id&type=doc", "", '', "title='{$lang->tree->manage}' class='btn btn-link'", '', '', '', $this->session->program)?>
|
@@ -124,9 +124,9 @@ var browseType = '';
$attachLib):?>
- | product}"), " " . $attachLib->name);?> |
+ createLink('doc', 'allLibs', "type=project&product={$currentLib->product}", '', '', $this->session->program), " " . $attachLib->name);?> |
- $type}"), " " . $attachLib->name);?> |
+ createLink('doc', 'showFiles', "type=$type&objectID={$currentLib->$type}", '', '', $this->session->program), " " . $attachLib->name);?> |
|
|
@@ -141,14 +141,14 @@ var browseType = '';
collector, ',' . $this->app->user->account . ',') !== false ? 'icon-star text-yellow' : 'icon-star-empty';?>
collector, ',' . $this->app->user->account . ',') !== false ? $lang->doc->cancelCollection : $lang->doc->collect;?>
- | id&orderBy=$orderBy&from=$from"), " " . $module->name);?> |
+ createLink('doc', 'browse', "libID=$libID&browseType=bymodule¶m=$module->id&orderBy=$orderBy&from=$from", '', '', $this->session->program), " " . $module->name);?> |
|
|
|
|
- id&objectType=module");?>" title="" class='btn btn-link ajaxCollect'>
+ id&objectType=module", '', '', $this->session->program);?>" title="" class='btn btn-link ajaxCollect'>
|
@@ -158,17 +158,17 @@ var browseType = '';
collector, ',' . $this->app->user->account . ',') !== false ? 'icon-star text-yellow' : 'icon-star-empty';?>
collector, ',' . $this->app->user->account . ',') !== false ? $lang->doc->cancelCollection : $lang->doc->collect;?>
- | id"), " " . $doc->title);?> |
+ createLink('doc', 'view', "docID=$doc->id", '', '', $this->session->program), " " . $doc->title);?> |
fileSize ? $doc->fileSize : '-';?> |
addedBy);?> |
addedDate, 'y-m-d');?> |
editedDate, 'y-m-d');?> |
- id&objectType=doc");?>" title="" class='btn btn-link ajaxCollect'>
+ id&objectType=doc", '', '', $this->session->program);?>" title="" class='btn btn-link ajaxCollect'>
- id", "", '', "title='{$lang->edit}' class='btn btn-link'")?>
- id", "", 'hiddenwin', "title='{$lang->delete}' class='btn btn-link'")?>
+ id", "", '', "title='{$lang->edit}' class='btn btn-link'", '', '', '', $this->session->program)?>
+ id", "", 'hiddenwin', "title='{$lang->delete}' class='btn btn-link'", '', '', '', $this->session->program)?>
|
diff --git a/module/doc/view/side.html.php b/module/doc/view/side.html.php
index d2426215b9..64d0d49a7a 100644
--- a/module/doc/view/side.html.php
+++ b/module/doc/view/side.html.php
@@ -37,7 +37,7 @@ $sideWidth = common::checkNotCN() ? '270' : '238';
doclib->create, $tabValue, '');
- if($text and common::hasPriv($tabValue, 'create')) echo html::a($this->createLink($tabValue, 'create'), $text, '', "class='text-ellipsis'");
+ if($text and common::hasPriv($tabValue, 'create')) echo html::a($this->createLink($tabValue, 'create', '', '', '', $this->session->program), $text, '', "class='text-ellipsis'");
?>
@@ -60,9 +60,9 @@ $sideWidth = common::checkNotCN() ? '270' : '238';
?>
>
0):?>
- createLink('doc', 'objectLibs', "type=$tabValue&objectID=$tabMenu->id"), $icon . $tabMenu->name, '', "class='text-ellipsis' title='{$tabMenu->name}'");?>
+ createLink('doc', 'objectLibs', "type=$tabValue&objectID=$tabMenu->id", '', '', $this->session->program), $icon . $tabMenu->name, '', "class='text-ellipsis' title='{$tabMenu->name}'");?>
- createLink('doc', 'browse', "libID=$mainLibID"), $icon . $tabMenu->name, '', "class='text-ellipsis' title='{$tabMenu->name}'");?>
+ createLink('doc', 'browse', "libID=$mainLibID", '', '', $this->session->program), $icon . $tabMenu->name, '', "class='text-ellipsis' title='{$tabMenu->name}'");?>
id])):?>
@@ -70,19 +70,19 @@ $sideWidth = common::checkNotCN() ? '270' : '238';
id");
+ $subLibLink = $this->createLink('doc', 'allLibs', "type=project&product=$tabMenu->id", '', '', $this->session->program);
$activeClass = ($this->methodName == 'alllibs' && $type == 'project' && $$tabValue == $tabMenu->id) ? "class='active'" : '';
$icon = 'icon-stack';
}
elseif($subLibID == 'files')
{
- $subLibLink = inlink('showFiles', "type=$tabValue&objectID=$tabMenu->id");
+ $subLibLink = $this->createLink('doc', 'showFiles', "type=$tabValue&objectID=$tabMenu->id", '', '', $this->session->program);
$activeClass = ($this->methodName == 'showfiles' && $type == $tabValue && $object->id == $tabMenu->id) ? "class='active'" : '';
$icon = 'icon-paper-clip';
}
else
{
- $subLibLink = inlink('browse', "libID=$subLibID");
+ $subLibLink = $this->createLink('doc', 'browse', "libID=$subLibID", '', '', $this->session->program);
$activeClass = ($this->methodName == 'browse' && $browseType != 'bymodule' && $subLibID == $libID) ? "class='active'" : '';
$icon = 'icon-folder-outline';
}
@@ -126,7 +126,7 @@ $sideWidth = common::checkNotCN() ? '270' : '238';
-
doclib->create, $tabValue, '');
- if($text and common::hasPriv('doc', 'createLib')) echo html::a($this->createLink('doc', 'createLib', "type={$tabValue}"), $text, '', "class='iframe' data-width='70%'");
+ if($text and common::hasPriv('doc', 'createLib')) echo html::a($this->createLink('doc', 'createLib', "type={$tabValue}", '', '', $this->session->program), $text, '', "class='iframe' data-width='70%'");
?>
@@ -139,13 +139,13 @@ $sideWidth = common::checkNotCN() ? '270' : '238';
$activeClass = ($this->methodName == 'browse' && isset($currentLib->id) && $currentLib->id == $sideLibID) ? 'active' : $activeClass;
?>
- >
- createLink('doc', 'browse', "libID=$sideLibID"), " " . $sideLibName, '', "class='text-ellipsis' title='{$sideLibName}'");?>
+ createLink('doc', 'browse', "libID=$sideLibID", '', '', $this->session->program), " " . $sideLibName, '', "class='text-ellipsis' title='{$sideLibName}'");?>
parent != 0) continue;?>
- methodName == 'browse' && $browseType == 'bymodule' && $moduleID == $module->id) echo "class='active'";?>>
- createLink('doc', 'browse', "libID=$sideLibID&browseType=byModule¶m={$module->id}"), " " . $module->name, '', "class='text-ellipsis' title='{$module->name}'");?>
+ createLink('doc', 'browse', "libID=$sideLibID&browseType=byModule¶m={$module->id}", '', '', $this->session->program), " " . $module->name, '', "class='text-ellipsis' title='{$module->name}'");?>
doc->printChildModule($module, $sideLibID, $this->methodName, $browseType, $moduleID);?>
@@ -185,7 +185,7 @@ $sideWidth = common::checkNotCN() ? '270' : '238';
doc->customShowLibs;?>