From 09c2a265f4500b7e6be8564a4b0fd1cf703bb338 Mon Sep 17 00:00:00 2001 From: sgm0422 <976204163@qq.com> Date: Fri, 12 Jun 2020 17:16:55 +0800 Subject: [PATCH] * Delete program in link. --- module/bug/model.php | 40 ++++++++++----------- module/bug/view/browse.html.php | 46 ++++++++++++------------ module/caselib/model.php | 2 +- module/caselib/view/browse.html.php | 26 +++++++------- module/common/model.php | 4 +-- module/doc/model.php | 2 +- module/doc/view/browse.html.php | 34 +++++++++--------- module/doc/view/side.html.php | 20 +++++------ module/jenkins/control.php | 2 +- module/job/view/browse.html.php | 10 +++--- module/product/view/browse.html.php | 46 ++++++++++++------------ module/product/view/roadmap.html.php | 4 +-- module/project/control.php | 16 ++++----- module/release/view/browse.html.php | 26 +++++++------- module/release/view/view.html.php | 30 ++++++++-------- module/story/model.php | 12 +++---- module/testcase/model.php | 26 +++++++------- module/testcase/view/browse.html.php | 4 +-- module/testcase/view/caseheader.html.php | 30 ++++++++-------- module/testreport/view/browse.html.php | 10 +++--- module/testsuite/view/browse.html.php | 14 ++++---- module/testtask/view/browse.html.php | 28 +++++++-------- 22 files changed, 216 insertions(+), 216 deletions(-) diff --git a/module/bug/model.php b/module/bug/model.php index e944d9c8ef..22063f22fc 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->session->program), $this->lang->qa->index) . $this->lang->colon; + $pageNav = html::a(helper::createLink('qa', 'index', ''), $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->session->program), $this->lang->qa->index, '', "class='btn'") . '
'; + $pageNav = '
' . html::a(helper::createLink('qa', 'index', 'locate=no'), $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", '', '', $this->session->program); + $link = helper::createLink('bug', 'report', "productID=$productID&browseType=$browseType&branchID=$branch&moduleID=$moduleID"); $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", '', '', $this->session->program); + $link = helper::createLink('bug', 'export', "productID=$productID&orderBy=$orderBy"); $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", '', '', $this->session->program); + $link = helper::createLink('bug', 'batchCreate', "productID=$productID&branch=$branch&projectID=0&moduleID=$moduleID"); $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", '', '', $this->session->program); + $link = helper::createLink('tutorial', 'wizard', "module=bug&method=create¶ms=$wizardParams"); $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", '', '', $this->session->program); + $link = helper::createLink('bug', 'create', "productID=$productID&branch=$branch&extra=moduleID=$moduleID"); $pageActions .= html::a($link, "" . $this->lang->bug->create, '', "class='btn btn-primary'"); } } @@ -417,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', '', '', '', $this->session->program))); + if(strpos($this->server->http_referer, $loginLink) !== false) die(js::locate(helper::createLink('bug', 'index', ''))); die(js::locate('back')); } } @@ -2478,7 +2478,7 @@ class bugModel extends model } } - $bugLink = helper::createLink('bug', 'view', "bugID=$bug->id", '', '', $this->session->program); + $bugLink = helper::createLink('bug', 'view', "bugID=$bug->id"); $account = $this->app->user->account; $id = $col->id; if($col->show) @@ -2519,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", '', '', $this->session->program), sprintf('%03d', $bug->id)); + echo html::checkbox('bugIDList', array($bug->id => '')) . html::a(helper::createLink('bug', 'view', "bugID=$bug->id"), sprintf('%03d', $bug->id)); } else { @@ -2563,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, $this->session->program), $story->title, '', "class='iframe'") : $story->title; + echo common::hasPriv('story', 'view') ? html::a(helper::createLink('story', 'view', "storyID=$story->id", 'html', true), $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, $this->session->program), $task->name, '', "class='iframe'") : $task->name; + echo common::hasPriv('task', 'view') ? html::a(helper::createLink('task', 'view', "taskID=$task->id", 'html', true), $task->name, '', "class='iframe'") : $task->name; } break; case 'type': @@ -2625,7 +2625,7 @@ class bugModel extends model } elseif($buildID and common::hasPriv('build', 'view')) { - echo html::a(helper::createLink('build', 'view', "buildID=$buildID", '', '', $this->session->program), $build, '', "title='$bug->openedBuild'"); + echo html::a(helper::createLink('build', 'view', "buildID=$buildID"), $build, '', "title='$bug->openedBuild'"); } else { @@ -2668,11 +2668,11 @@ class bugModel extends model break; case 'actions': $params = "bugID=$bug->id"; - 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); + 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'); break; } echo ''; @@ -2697,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, $this->session->program); + $assignToLink = helper::createLink('bug', 'assignTo', "bugID=$bug->id", '', true); $assignToHtml = html::a($assignToLink, " {$assignedToText}", '', "class='$btnClass'"); echo !common::hasPriv('bug', 'assignTo', $bug) ? "{$assignedToText}" : $assignToHtml; @@ -2729,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', '', $this->session->program), "#$id " . $name); + if($name) $action->appendLink = html::a(zget($this->config->mail, 'domain', common::getSysURL()) . helper::createLink($action->objectType, 'view', "id=$id", 'html'), "#$id " . $name); } } diff --git a/module/bug/view/browse.html.php b/module/bug/view/browse.html.php index e3b4972fd6..8b3010acfa 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' ? $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")'; + $removeLink = $browseType == 'bymodule' ? $this->createLink('bug', 'browse', "productID=$productID&branch=$branch&browseType=$browseType¶m=0&orderBy=$orderBy&recTotal=0&recPerPage={$pager->recPerPage}") : '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", '', '', $this->session->program), $value); + echo html::a($this->createLink('bug', 'browse', "productid=$productID&branch=$branch&browseType=$key"), $value); } echo ''; } elseif($menuItem->name == 'QUERY') { - $searchBrowseLink = $this->createLink('bug', 'browse', "productID=$productID&branch=$branch&browseType=bySearch¶m=%s", '', '', $this->session->program); + $searchBrowseLink = $this->createLink('bug', 'browse', "productID=$productID&branch=$branch&browseType=bySearch¶m=%s"); $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", '', '', $this->session->program), "{$label}", '', "class='btn btn-link $active'") . '
    • '; + echo '
  • ' . html::a($this->createLink('bug', 'browse', "productid=$productID&branch=$branch&browseType=$menuBrowseType"), "{$label}", '', "class='btn btn-link $active'") . '
    • '; } echo '
    '; } } else { - echo html::a($this->createLink('bug', 'browse', "productid=$productID&branch=$branch&browseType=$menuBrowseType", '', '', $this->session->program), $label, '', "class='btn btn-link $active'"); + echo html::a($this->createLink('bug', 'browse', "productid=$productID&branch=$branch&browseType=$menuBrowseType"), $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", '', '', $this->session->program) : '#'; + $link = common::hasPriv('bug', 'export') ? $this->createLink('bug', 'export', "productID=$productID&orderBy=$orderBy&browseType=$browseType") : '#'; echo "
  • " . html::a($link, $lang->bug->export, '', $misc) . "
    • "; ?> " . $lang->bug->batchCreate, '', "class='btn btn-secondary'", '', '', '', $this->session->program); + common::printLink('bug', 'batchCreate', "productID=$productID&branch=$branch&projectID=0&moduleID=$moduleID", "" . $lang->bug->batchCreate, '', "class='btn btn-secondary'"); 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", '', '', $this->session->program), "" . $lang->bug->create, '', "class='btn btn-primary btn-bug-create'"); + echo html::a($this->createLink('tutorial', 'wizard', "module=bug&method=create¶ms=$wizardParams"), "" . $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'", '', '', '', $this->session->program); + common::printLink('bug', 'create', "productID=$productID&branch=$branch&extra=moduleID=$moduleID", "" . $lang->bug->create, '', "class='btn btn-primary'"); } ?> @@ -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", '', '', $this->session->program); + $link = $this->createLink('tutorial', 'wizard', "module=bug&method=create¶ms=$wizardParams"); 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", '', '', $this->session->program); + $link = $this->createLink('bug', 'create', "productID=$productID&branch=$branch&extra=moduleID=$moduleID"); $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", '', '', $this->session->program); + $batchLink = $this->createLink('bug', 'batchCreate', "productID=$productID&branch=$branch&projectID=0&moduleID=$moduleID"); 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'", '', '', '', $this->session->program);?> + tree->manage, '', "class='btn btn-info btn-wide'");?>
    @@ -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", '', '', $this->session->program), " " . $lang->bug->create, '', "class='btn btn-info'");?> + createLink('bug', 'create', "productID=$productID&branch=$branch&extra=moduleID=$moduleID"), " " . $lang->bug->create, '', "class='btn btn-info'");?>

    @@ -241,7 +241,7 @@ $currentBrowseType = isset($lang->bug->mySelects[$browseType]) && in_array($brow
    createLink('bug', 'batchEdit', "productID=$productID&branch=$branch", '', '', $this->session->program); + $actionLink = $this->createLink('bug', 'batchEdit', "productID=$productID&branch=$branch"); $misc = common::hasPriv('bug', 'batchEdit') ? "onclick=\"setFormAction('$actionLink')\"" : "disabled='disabled'"; echo html::commonButton($lang->edit, $misc); ?> @@ -249,15 +249,15 @@ $currentBrowseType = isset($lang->bug->mySelects[$browseType]) && in_array($brow
      createLink('bug', 'batchConfirm', '', '', '', $this->session->program); + $actionLink = $this->createLink('bug', 'batchConfirm', ''); $misc = common::hasPriv('bug', 'batchConfirm') ? "onclick=\"setFormAction('$actionLink', 'hiddenwin')\"" : $class; if($misc) echo "
    • " . html::a('javascript:;', $lang->bug->confirmBug, '', $misc) . "
      • "; - $actionLink = $this->createLink('bug', 'batchClose', '', '', '', $this->session->program); + $actionLink = $this->createLink('bug', 'batchClose', ''); $misc = common::hasPriv('bug', 'batchClose') ? "onclick=\"setFormAction('$actionLink', 'hiddenwin')\"" : $class; if($misc) echo "
    • " . html::a('javascript:;', $lang->bug->close, '', $misc) . "
      • "; - $actionLink = $this->createLink('bug', 'batchActivate', "productID=$productID&branch=$branch", '', '', $this->session->program); + $actionLink = $this->createLink('bug', 'batchActivate', "productID=$productID&branch=$branch"); $misc = common::hasPriv('bug', 'batchActivate') ? "onclick=\"setFormAction('$actionLink')\"" : $class; if($misc) echo "
    • " . html::a('javascript:;', $lang->bug->activate, '', $misc) . "
      • "; @@ -271,7 +271,7 @@ $currentBrowseType = isset($lang->bug->mySelects[$browseType]) && in_array($brow unset($lang->bug->resolutionList['tostory']); foreach($lang->bug->resolutionList as $key => $resolution) { - $actionLink = $this->createLink('bug', 'batchResolve', "resolution=$key", '', '', $this->session->program); + $actionLink = $this->createLink('bug', 'batchResolve', "resolution=$key"); if($key == 'fixed') { $withSearch = count($builds) > 4; @@ -282,7 +282,7 @@ $currentBrowseType = isset($lang->bug->mySelects[$browseType]) && in_array($brow unset($builds['']); foreach($builds as $key => $build) { - $actionLink = $this->createLink('bug', 'batchResolve', "resolution=fixed&resolvedBuild=$key", '', '', $this->session->program); + $actionLink = $this->createLink('bug', 'batchResolve', "resolution=fixed&resolvedBuild=$key"); echo "
    • "; echo html::a('javascript:;', $build, '', "onclick=\"setFormAction('$actionLink', 'hiddenwin')\""); echo "
      • "; @@ -321,7 +321,7 @@ $currentBrowseType = isset($lang->bug->mySelects[$browseType]) && in_array($brow foreach($branches as $branchID => $branchName) { $searchKey = $withSearch ? ('data-key="' . zget($branchsPinYin, $branchName, '') . '"') : ''; - $actionLink = $this->createLink('bug', 'batchChangeBranch', "branchID=$branchID", '', '', $this->session->program); + $actionLink = $this->createLink('bug', 'batchChangeBranch', "branchID=$branchID"); echo html::a('#', $branchName, '', "$searchKey onclick=\"setFormAction('$actionLink', 'hiddenwin')\" data-key='$branchID'"); } ?> @@ -349,7 +349,7 @@ $currentBrowseType = isset($lang->bug->mySelects[$browseType]) && in_array($brow foreach($modules as $moduleId => $module) { $searchKey = $withSearch ? ('data-key="' . zget($modulesPinYin, $module, '') . '"') : ''; - $actionLink = $this->createLink('bug', 'batchChangeModule', "moduleID=$moduleId", '', '', $this->session->program); + $actionLink = $this->createLink('bug', 'batchChangeModule', "moduleID=$moduleId"); echo html::a('#', $module, '', "$searchKey onclick=\"setFormAction('$actionLink', 'hiddenwin')\" data-key='$moduleID'"); } ?> @@ -374,7 +374,7 @@ $currentBrowseType = isset($lang->bug->mySelects[$browseType]) && in_array($brow
      createLink('bug', 'batchAssignTo', "productID={$productID}&type=product", '', '', $this->session->program); + $actionLink = $this->createLink('bug', 'batchAssignTo', "productID={$productID}&type=product"); echo html::select('assignedTo', $memberPairs, '', 'class="hidden"'); foreach ($memberPairs as $key => $value) { diff --git a/module/caselib/model.php b/module/caselib/model.php index f97ba446ef..fda6b30354 100644 --- a/module/caselib/model.php +++ b/module/caselib/model.php @@ -85,7 +85,7 @@ class caselibModel extends model $pageActions .= "
      "; if(common::hasPriv('caselib', 'exportTemplet')) { - $link = helper::createLink('caselib', 'exportTemplet', "libID=$libID", '', '', $this->session->program); + $link = helper::createLink('caselib', 'exportTemplet', "libID=$libID"); $pageActions .= html::a($link, " " . $this->lang->caselib->exportTemplet, '', "class='btn btn-link export'"); } if(common::hasPriv('caselib', 'import')) diff --git a/module/caselib/view/browse.html.php b/module/caselib/view/browse.html.php index 859215953f..6293eaab65 100644 --- a/module/caselib/view/browse.html.php +++ b/module/caselib/view/browse.html.php @@ -53,12 +53,12 @@ js::set('flow', $config->global->flow);
      - " . $lang->caselib->exportTemplet, '', "class='btn btn-link export' data-width='35%'", '', '', '', $this->session->program);?> - " . $lang->testcase->importFile, '', "class='btn btn-link export'", '', '', '', $this->session->program);?> + " . $lang->caselib->exportTemplet, '', "class='btn btn-link export' data-width='35%'");?> + " . $lang->testcase->importFile, '', "class='btn btn-link export'");?>
      - " . $lang->testcase->batchCreate, '', "class='btn btn-secondary'", '', '', '', $this->session->program);?> - " . $lang->testcase->create, '', "class='btn btn-primary'", '', '', '', $this->session->program);?> + " . $lang->testcase->batchCreate, '', "class='btn btn-secondary'");?> + " . $lang->testcase->create, '', "class='btn btn-primary'");?>
      @@ -75,7 +75,7 @@ js::set('flow', $config->global->flow);
      - tree->manage, '', "class='btn btn-info btn-wide'", '', '', '', $this->session->program);?> + tree->manage, '', "class='btn btn-info btn-wide'");?>
    @@ -87,7 +87,7 @@ js::set('flow', $config->global->flow);

    testcase->noCase;?> - createLink('caselib', 'createCase', "libID=$libID&moduleID=" . (isset($moduleID) ? $moduleID : 0), '', '', $this->session->program), " " . $lang->testcase->create, '', "class='btn btn-info'");?> + createLink('caselib', 'createCase', "libID=$libID&moduleID=" . (isset($moduleID) ? $moduleID : 0)), " " . $lang->testcase->create, '', "class='btn btn-info'");?>

    @@ -124,7 +124,7 @@ js::set('flow', $config->global->flow); - id => '')) . html::a($this->createLink('testcase', 'view', "caseID=$case->id&version=$case->version", '', '', $this->session->program), sprintf('%03d', $case->id));?> + id => '')) . html::a($this->createLink('testcase', 'view', "caseID=$case->id&version=$case->version"), 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", '', '', $this->session->program);?> + createLink('testcase', 'view', "caseID=$case->id&version=$case->version");?> 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", '', '', $this->session->program); + $deleteURL = $this->createLink('testcase', 'delete', "caseID=$case->id&confirm=yes"); 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", '', '', $this->session->program);?> + createLink('testcase', 'batchEdit', "libID=$libID&branch=0&type=lib");?> edit, $misc);?> @@ -167,7 +167,7 @@ js::set('flow', $config->global->flow); createLink('testcase', 'batchDelete', "libID=$libID", '', '', $this->session->program); + $actionLink = $this->createLink('testcase', 'batchDelete', "libID=$libID"); $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", '', '', $this->session->program); + $actionLink = $this->createLink('testcase', 'batchReview', "result=$key"); 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", '', '', $this->session->program); + $actionLink = $this->createLink('testcase', 'batchChangeModule', "moduleID=$moduleId"); echo "
    • " . html::a('#', $module, '', "onclick=\"setFormAction('$actionLink', 'hiddenwin')\"") . "
      • "; } echo '
    '; diff --git a/module/common/model.php b/module/common/model.php index 55d18d7118..76988ba8de 100644 --- a/module/common/model.php +++ b/module/common/model.php @@ -1098,9 +1098,9 @@ EOD; * @access public * @return void */ - public static function printIcon($module, $method, $vars = '', $object = '', $type = 'button', $icon = '', $target = '', $extraClass = '', $onlyBody = false, $misc = '', $title = '', $programID = 0) + public static function printIcon($module, $method, $vars = '', $object = '', $type = 'button', $icon = '', $target = '', $extraClass = '', $onlyBody = false, $misc = '', $title = '') { - echo common::buildIconButton($module, $method, $vars, $object, $type, $icon, $target, $extraClass, $onlyBody, $misc, $title, $programID); + echo common::buildIconButton($module, $method, $vars, $object, $type, $icon, $target, $extraClass, $onlyBody, $misc, $title); } /** diff --git a/module/doc/model.php b/module/doc/model.php index 9771692585..ed6d482ef3 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->session->program), " " . $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->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 57aeaeca8a..ea07434a31 100644 --- a/module/doc/view/browse.html.php +++ b/module/doc/view/browse.html.php @@ -46,9 +46,9 @@ var browseType = '';
      -
    • " . $lang->doc->manageType, '', '', '', '', '', $this->session->program);?>
      • -
    • " . $lang->doc->editLib, '', "class='iframe'", '', '', '', $this->session->program);?>
      • -
    • " . $lang->doc->deleteLib, 'hiddenwin', '', '', '', '', $this->session->program);?>
      • +
    • " . $lang->doc->manageType);?>
      • +
    • " . $lang->doc->editLib, '', "class='iframe'");?>
      • +
    • " . $lang->doc->deleteLib, 'hiddenwin');?>
    @@ -57,7 +57,7 @@ var browseType = '';
      doc->typeList as $typeKey => $typeName):?> doc->officeTypes, $typeKey) !== false ? 'iframe' : '';?> -
    • createLink('doc', 'create', "libID=$libID&moduleID=$moduleID&type=$typeKey", '', '', $this->session->program), $typeName, '', "class='$class'");?>
      • +
    • createLink('doc', 'create', "libID=$libID&moduleID=$moduleID&type=$typeKey"), $typeName, '', "class='$class'");?>
    @@ -75,7 +75,7 @@ var browseType = ''; doc->noDoc;?> - createLink('doc', 'create', "libID={$libID}&moduleID=$moduleID", '', '', $this->session->program), " " . $lang->doc->create, '', "class='btn btn-info'");?> + createLink('doc', 'create', "libID={$libID}&moduleID=$moduleID"), " " . $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;?> - createLink('doc', 'browse', "libID={$lib->id}&browseType=all¶m=0&orderBy=$orderBy&from=$from", '', '', $this->session->program), "  " . $lib->name);?> + createLink('doc', 'browse', "libID={$lib->id}&browseType=all¶m=0&orderBy=$orderBy&from=$from"), "  " . $lib->name);?> - id&objectType=doclib", '', '', $this->session->program);?>" title="" class='btn btn-link ajaxCollect'> + id&objectType=doclib");?>" title="" class='btn btn-link ajaxCollect'> - 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)?> + id", "", '', "title='{$lang->edit}' class='btn btn-link iframe'")?> + id&type=doc", "", '', "title='{$lang->tree->manage}' class='btn btn-link'")?> @@ -124,9 +124,9 @@ var browseType = ''; $attachLib):?> - createLink('doc', 'allLibs', "type=project&product={$currentLib->product}", '', '', $this->session->program), "  " . $attachLib->name);?> + createLink('doc', 'allLibs', "type=project&product={$currentLib->product}"), "  " . $attachLib->name);?> - createLink('doc', 'showFiles', "type=$type&objectID={$currentLib->$type}", '', '', $this->session->program), "  " . $attachLib->name);?> + createLink('doc', 'showFiles', "type=$type&objectID={$currentLib->$type}"), "  " . $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;?> - createLink('doc', 'browse', "libID=$libID&browseType=bymodule¶m=$module->id&orderBy=$orderBy&from=$from", '', '', $this->session->program), "  " . $module->name);?> + createLink('doc', 'browse', "libID=$libID&browseType=bymodule¶m=$module->id&orderBy=$orderBy&from=$from"), "  " . $module->name);?> - id&objectType=module", '', '', $this->session->program);?>" title="" class='btn btn-link ajaxCollect'> + id&objectType=module");?>" 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;?> - createLink('doc', 'view', "docID=$doc->id", '', '', $this->session->program), "  " . $doc->title);?> + createLink('doc', 'view', "docID=$doc->id"), "  " . $doc->title);?> fileSize ? $doc->fileSize : '-';?> addedBy);?> addedDate, 'y-m-d');?> editedDate, 'y-m-d');?> - id&objectType=doc", '', '', $this->session->program);?>" title="" class='btn btn-link ajaxCollect'> + id&objectType=doc");?>" title="" class='btn btn-link ajaxCollect'> - id", "", '', "title='{$lang->edit}' class='btn btn-link'", '', '', '', $this->session->program)?> - id", "", 'hiddenwin', "title='{$lang->delete}' class='btn btn-link'", '', '', '', $this->session->program)?> + id", "", '', "title='{$lang->edit}' class='btn btn-link'")?> + id", "", 'hiddenwin', "title='{$lang->delete}' class='btn btn-link'")?> diff --git a/module/doc/view/side.html.php b/module/doc/view/side.html.php index 64d0d49a7a..9f670f9955 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', '', '', '', $this->session->program), $text, '', "class='text-ellipsis'"); + if($text and common::hasPriv($tabValue, 'create')) echo html::a($this->createLink($tabValue, 'create', ''), $text, '', "class='text-ellipsis'"); ?>
    • @@ -60,9 +60,9 @@ $sideWidth = common::checkNotCN() ? '270' : '238'; ?>
  • > 0):?> - createLink('doc', 'objectLibs', "type=$tabValue&objectID=$tabMenu->id", '', '', $this->session->program), $icon . $tabMenu->name, '', "class='text-ellipsis' title='{$tabMenu->name}'");?> + createLink('doc', 'objectLibs', "type=$tabValue&objectID=$tabMenu->id"), $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}'");?> + createLink('doc', 'browse', "libID=$mainLibID"), $icon . $tabMenu->name, '', "class='text-ellipsis' title='{$tabMenu->name}'");?> id])):?>
      @@ -70,19 +70,19 @@ $sideWidth = common::checkNotCN() ? '270' : '238'; createLink('doc', 'allLibs', "type=project&product=$tabMenu->id", '', '', $this->session->program); + $subLibLink = $this->createLink('doc', 'allLibs', "type=project&product=$tabMenu->id"); $activeClass = ($this->methodName == 'alllibs' && $type == 'project' && $$tabValue == $tabMenu->id) ? "class='active'" : ''; $icon = 'icon-stack'; } elseif($subLibID == 'files') { - $subLibLink = $this->createLink('doc', 'showFiles', "type=$tabValue&objectID=$tabMenu->id", '', '', $this->session->program); + $subLibLink = $this->createLink('doc', 'showFiles', "type=$tabValue&objectID=$tabMenu->id"); $activeClass = ($this->methodName == 'showfiles' && $type == $tabValue && $object->id == $tabMenu->id) ? "class='active'" : ''; $icon = 'icon-paper-clip'; } else { - $subLibLink = $this->createLink('doc', 'browse', "libID=$subLibID", '', '', $this->session->program); + $subLibLink = $this->createLink('doc', 'browse', "libID=$subLibID"); $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}", '', '', $this->session->program), $text, '', "class='iframe' data-width='70%'"); + if($text and common::hasPriv('doc', 'createLib')) echo html::a($this->createLink('doc', 'createLib', "type={$tabValue}"), $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", '', '', $this->session->program), " " . $sideLibName, '', "class='text-ellipsis' title='{$sideLibName}'");?> + createLink('doc', 'browse', "libID=$sideLibID"), " " . $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}", '', '', $this->session->program), " " . $module->name, '', "class='text-ellipsis' title='{$module->name}'");?> + createLink('doc', 'browse', "libID=$sideLibID&browseType=byModule¶m={$module->id}"), " " . $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;?>
    • -
    session->program);?>' target='hiddenwin' method='post'> + ' target='hiddenwin' method='post'> diff --git a/module/jenkins/control.php b/module/jenkins/control.php index 3903400792..2be1edd118 100644 --- a/module/jenkins/control.php +++ b/module/jenkins/control.php @@ -35,7 +35,7 @@ class jenkins extends control */ public function browse($orderBy = 'id_desc', $recTotal = 0, $recPerPage = 20, $pageID = 1) { - if(common::hasPriv('jenkins', 'create')) $this->lang->modulePageActions = html::a(helper::createLink('jenkins', 'create', '', '', '', $this->session->program), " " . $this->lang->jenkins->create, '', "class='btn btn-primary'"); + if(common::hasPriv('jenkins', 'create')) $this->lang->modulePageActions = html::a(helper::createLink('jenkins', 'create', ''), " " . $this->lang->jenkins->create, '', "class='btn btn-primary'"); $this->app->loadClass('pager', $static = true); $pager = new pager($recTotal, $recPerPage, $pageID); diff --git a/module/job/view/browse.html.php b/module/job/view/browse.html.php index adfd19385e..bf8e750400 100644 --- a/module/job/view/browse.html.php +++ b/module/job/view/browse.html.php @@ -13,11 +13,11 @@
    @@ -41,7 +41,7 @@ $job):?>
    - + jkJob) . '@' . $job->jenkinsName;?> @@ -55,7 +55,7 @@ common::printIcon('compile', 'browse', "jobID=$id", '', 'list', 'history'); common::printIcon('job', 'edit', "jobID=$id", '', 'list', 'edit'); common::printIcon('job', 'exec', "jobID=$id", '', 'list', 'play', 'hiddenwin'); - if(common::hasPriv('job', 'delete')) echo html::a($this->createLink('job', 'delete', "jobID=$id", '', '', $this->session->program), '', 'hiddenwin', "title='{$lang->job->delete}' class='btn'"); + if(common::hasPriv('job', 'delete')) echo html::a($this->createLink('job', 'delete', "jobID=$id"), '', 'hiddenwin', "title='{$lang->job->delete}' class='btn'"); ?> diff --git a/module/product/view/browse.html.php b/module/product/view/browse.html.php index 8f154cc84b..6d52f38860 100644 --- a/module/product/view/browse.html.php +++ b/module/product/view/browse.html.php @@ -31,7 +31,7 @@ js::set('foldAll', $lang->project->treeLevel['root']); echo $moduleName; if($moduleID) { - $removeLink = $browseType == 'bymodule' ? $this->createLink('product', 'browse', "productID=$productID&branch=$branch&browseType=$browseType¶m=0&storyType=$storyType&orderBy=$orderBy&recTotal=0&recPerPage={$pager->recPerPage}", '', '', $this->session->program) : 'javascript:removeCookieByKey("storyModule")'; + $removeLink = $browseType == 'bymodule' ? $this->createLink('product', 'browse', "productID=$productID&branch=$branch&browseType=$browseType¶m=0&storyType=$storyType&orderBy=$orderBy&recTotal=0&recPerPage={$pager->recPerPage}") : 'javascript:removeCookieByKey("storyModule")'; echo html::a($removeLink, "", '', "class='text-muted'"); } ?> @@ -62,50 +62,50 @@ js::set('foldAll', $lang->project->treeLevel['root']); foreach($lang->product->moreSelects as $key => $value) { $active = $key == $storyBrowseType ? 'btn-active-text' : ''; - echo '
  • ' . html::a($this->createLink('product', 'browse', "productID=$productID&branch=$branch&browseType=$key¶m=0&storyType=$storyType", '', '', $this->session->program), "{$value}", '', "class='btn btn-link $active'") . '
    • '; + echo '
  • ' . html::a($this->createLink('product', 'browse', "productID=$productID&branch=$branch&browseType=$key¶m=0&storyType=$storyType"), "{$value}", '', "class='btn btn-link $active'") . '
    • '; } echo ''; } } elseif($menuItem->name == 'QUERY') { - $searchBrowseLink = $this->createLink('product', 'browse', "productID=$productID&branch=$branch&browseType=$menuBrowseType¶m=%s&storyType=$storyType", '', '', $this->session->program); + $searchBrowseLink = $this->createLink('product', 'browse', "productID=$productID&branch=$branch&browseType=$menuBrowseType¶m=%s&storyType=$storyType"); $isBySearch = $this->session->storyBrowseType == 'bysearch'; include '../../common/view/querymenu.html.php'; } else { - echo html::a($this->createLink('product', 'browse', "productID=$productID&branch=$branch&browseType=$menuBrowseType¶m=0&storyType=$storyType", '', '', $this->session->program), "$menuItem->text" . ($menuItem->name == $this->session->storyBrowseType ? ' ' . $pager->recTotal . '' : ''), '', "id='{$menuItem->name}Tab' class='btn btn-link" . ($this->session->storyBrowseType == $menuItem->name ? ' btn-active-text' : '') . "'"); + echo html::a($this->createLink('product', 'browse', "productID=$productID&branch=$branch&browseType=$menuBrowseType¶m=0&storyType=$storyType"), "$menuItem->text" . ($menuItem->name == $this->session->storyBrowseType ? ' ' . $pager->recTotal . '' : ''), '', "id='{$menuItem->name}Tab' class='btn btn-link" . ($this->session->storyBrowseType == $menuItem->name ? ' btn-active-text' : '') . "'"); } } ?> product->searchStory;?>
    - session->program); ?> +
    - createLink('story', 'batchCreate', "productID=$productID&branch=$branch&moduleID=$moduleID", '', '', $this->session->program), " {$lang->story->batchCreate}", '', "class='btn btn btn-secondary'");?> + createLink('story', 'batchCreate', "productID=$productID&branch=$branch&moduleID=$moduleID"), " {$lang->story->batchCreate}", '', "class='btn btn btn-secondary'");?> createLink('tutorial', 'wizard', "module=story&method=create¶ms=$wizardParams", '', '', $this->session->program); + $link = $this->createLink('tutorial', 'wizard', "module=story&method=create¶ms=$wizardParams"); echo html::a($link, " {$lang->story->create}", '', "class='btn btn-primary create-story-btn'"); } else { - $link = $this->createLink('story', 'create', "productID=$productID&branch=$branch&moduleID=$moduleID", '', '', $this->session->program); + $link = $this->createLink('story', 'create', "productID=$productID&branch=$branch&moduleID=$moduleID"); if(common::hasPriv('story', 'create')) echo html::a($link, " {$lang->story->create}", '', "class='btn btn-primary'"); } ?> @@ -115,12 +115,12 @@ js::set('foldAll', $lang->project->treeLevel['root']); if(commonModel::isTutorialMode()) { $wizardParams = helper::safe64Encode("productID=$productID&branch=$branch&moduleID=$moduleID"); - $link = $this->createLink('tutorial', 'wizard', "module=story&method=create¶ms=$wizardParams", '', '', $this->session->program); + $link = $this->createLink('tutorial', 'wizard', "module=story&method=create¶ms=$wizardParams"); echo html::a($link, " {$lang->story->create} ", '', "class='btn btn-primary create-story-btn'"); } else { - $link = $this->createLink('story', 'create', "product=$productID&branch=$branch&moduleID=$moduleID", '', '', $this->session->program); + $link = $this->createLink('story', 'create', "product=$productID&branch=$branch&moduleID=$moduleID"); $disabled = ''; if(!common::hasPriv('story', 'create')) { @@ -134,7 +134,7 @@ js::set('foldAll', $lang->project->treeLevel['root']);
  • > createLink('story', 'batchCreate', "productID=$productID&branch=$branch&moduleID=$moduleID", '', '', $this->session->program); + $batchLink = $this->createLink('story', 'batchCreate', "productID=$productID&branch=$branch&moduleID=$moduleID"); echo "
  • " . html::a($batchLink, "" . $lang->story->batchCreate) . "
    • "; ?> @@ -156,7 +156,7 @@ js::set('foldAll', $lang->project->treeLevel['root']);
    - tree->manage, '', "class='btn btn-info btn-wide'", '', '', '', $this->session->program);?> + tree->manage, '', "class='btn btn-info btn-wide'");?>
    @@ -168,7 +168,7 @@ js::set('foldAll', $lang->project->treeLevel['root']);

    story->noStory;?> - createLink('story', 'create', "productID={$productID}&branch={$branch}&moduleID={$moduleID}", '', '', $this->session->program), " " . $lang->story->create, '', "class='btn btn-info'");?> + createLink('story', 'create', "productID={$productID}&branch={$branch}&moduleID={$moduleID}"), " " . $lang->story->create, '', "class='btn btn-info'");?>

    @@ -230,7 +230,7 @@ js::set('foldAll', $lang->project->treeLevel['root']); createLink('story', 'batchEdit', "productID=$productID&projectID=0&branch=$branch", '', '', $this->session->program); + $actionLink = $this->createLink('story', 'batchEdit', "productID=$productID&projectID=0&branch=$branch"); ?> edit, "data-form-action='$actionLink' $disabled");?> @@ -238,7 +238,7 @@ js::set('foldAll', $lang->project->treeLevel['root']); createLink('story', 'batchClose', "productID=$productID&projectID=0", '', '', $this->session->program); + $actionLink = $this->createLink('story', 'batchClose', "productID=$productID&projectID=0"); $misc = $canBatchClose ? "onclick=\"setFormAction('$actionLink')\"" : $class; echo "
  • " . html::a('#', $lang->close, '', $misc) . "
    • "; @@ -251,7 +251,7 @@ js::set('foldAll', $lang->project->treeLevel['root']); unset($lang->story->reviewResultList['revert']); foreach($lang->story->reviewResultList as $key => $result) { - $actionLink = $this->createLink('story', 'batchReview', "result=$key", '', '', $this->session->program); + $actionLink = $this->createLink('story', 'batchReview', "result=$key"); if($key == 'reject') { echo "
  • "; @@ -263,7 +263,7 @@ js::set('foldAll', $lang->project->treeLevel['root']); foreach($lang->story->reasonList as $key => $reason) { - $actionLink = $this->createLink('story', 'batchReview', "result=reject&reason=$key", '', '', $this->session->program); + $actionLink = $this->createLink('story', 'batchReview', "result=reject&reason=$key"); echo "
  • "; echo html::a('#', $reason, '', "onclick=\"setFormAction('$actionLink', 'hiddenwin')\""); echo "
    • "; @@ -291,7 +291,7 @@ js::set('foldAll', $lang->project->treeLevel['root']); echo "
      "; foreach($branches as $branchID => $branchName) { - $actionLink = $this->createLink('story', 'batchChangeBranch', "branchID=$branchID", '', '', $this->session->program); + $actionLink = $this->createLink('story', 'batchChangeBranch', "branchID=$branchID"); echo "
    • " . html::a('#', $branchName, '', "onclick=\"setFormAction('$actionLink', 'hiddenwin')\"") . "
      • "; } echo '
    '; @@ -308,7 +308,7 @@ js::set('foldAll', $lang->project->treeLevel['root']); { if(empty($key)) continue; if(strpos('tested|verified|released|closed', $key) === false) continue; - $actionLink = $this->createLink('story', 'batchChangeStage', "stage=$key", '', '', $this->session->program); + $actionLink = $this->createLink('story', 'batchChangeStage', "stage=$key"); echo "
  • " . html::a('#', $stage, '', "onclick=\"setFormAction('$actionLink', 'hiddenwin')\"") . "
    • "; } echo ''; @@ -340,7 +340,7 @@ js::set('foldAll', $lang->project->treeLevel['root']); foreach($modules as $moduleId => $module) { $searchKey = $withSearch ? ('data-key="' . zget($modulesPinYin, $module, '') . '"') : ''; - $actionLink = $this->createLink('story', 'batchChangeModule', "moduleID=$moduleId", '', '', $this->session->program); + $actionLink = $this->createLink('story', 'batchChangeModule', "moduleID=$moduleId"); echo html::a('#', empty($module) ? '/' : $module, '', "$searchKey onclick=\"setFormAction('$actionLink', 'hiddenwin')\""); } ?> @@ -370,7 +370,7 @@ js::set('foldAll', $lang->project->treeLevel['root']); foreach($plans as $planID => $plan) { $searchKey = $withSearch ? ('data-key="' . zget($plansPinYin, $plan, '') . '"') : ''; - $actionLink = $this->createLink('story', 'batchChangePlan', "planID=$planID", '', '', $this->session->program); + $actionLink = $this->createLink('story', 'batchChangePlan', "planID=$planID"); echo html::a('#', $plan, '', "$searchKey title='{$plan}' onclick=\"setFormAction('$actionLink', 'hiddenwin')\""); } ?> @@ -384,7 +384,7 @@ js::set('foldAll', $lang->project->treeLevel['root']); 10; - $actionLink = $this->createLink('story', 'batchAssignTo', "productID=$productID", '', '', $this->session->program); + $actionLink = $this->createLink('story', 'batchAssignTo', "productID=$productID"); echo html::select('assignedTo', $users, '', 'class="hidden"'); ?>
    diff --git a/module/product/view/roadmap.html.php b/module/product/view/roadmap.html.php index 59574049ae..e3e5892c6d 100644 --- a/module/product/view/roadmap.html.php +++ b/module/product/view/roadmap.html.php @@ -42,7 +42,7 @@

    release->noRelease;?> - createLink('release', 'create', "productID=$product->id&branch=$branchKey", '', '', $this->session->program), " " . $lang->release->create, '', "class='btn btn-info'");?> + createLink('release', 'create', "productID=$product->id&branch=$branchKey"), " " . $lang->release->create, '', "class='btn btn-info'");?>

    @@ -60,7 +60,7 @@ - + - + type != 'normal'):?> @@ -71,17 +71,17 @@ $story):?> - createLink('story', 'view', "storyID=$story->id", '', true, $this->session->program);?> + createLink('story', 'view', "storyID=$story->id", '', true);?> - createLink('bug', 'view', "bugID=$bug->id", '', true, $this->session->program);?> + createLink('bug', 'view', "bugID=$bug->id", '', true);?>
    doc->customShowLibsList, $config->doc->custom->showLibs);?>
    createLink('job', 'view', "jobID={$job->id}", 'html', true, $this->session->program), $job->name, '', "class='iframe' data-width='90%'") : $job->name;?>createLink('job', 'view', "jobID={$job->id}", 'html', true), $job->name, '', "class='iframe' data-width='90%'") : $job->name;?> repoName; ?> job->frameList, $job->frame);?>
    id", '', '', $this->session->program), sprintf('%03d', $release->id));?>id"), sprintf('%03d', $release->id));?> marker ? " " : ''; - echo html::a($this->createLink('release', 'view', "release=$release->id", '', '', $this->session->program), $release->name) . $flagIcon; + echo html::a($this->createLink('release', 'view', "release=$release->id"), $release->name) . $flagIcon; ?> project) ? $release->buildName : html::a($this->createLink('build', 'view', "buildID=$release->buildID", '', '', $this->session->program), $release->buildName);?>project) ? $release->buildName : html::a($this->createLink('build', 'view', "buildID=$release->buildID"), $release->buildName);?> '>branch];?> createLink('release', 'view', "releaseID=$release->id&type=story&link=true", '', '', $this->session->program), ' ', '', "class='btn' title='{$lang->release->linkStory}'"); - if(common::hasPriv('release', 'linkBug') and $config->global->flow != 'onlyStory') echo html::a($this->createLink('release', 'view', "releaseID=$release->id&type=bug&link=true", '', '', $this->session->program), ' ', '', "class='btn' title='{$lang->release->linkBug}'"); + if(common::hasPriv('release', 'linkStory')) echo html::a($this->createLink('release', 'view', "releaseID=$release->id&type=story&link=true"), ' ', '', "class='btn' title='{$lang->release->linkStory}'"); + if(common::hasPriv('release', 'linkBug') and $config->global->flow != 'onlyStory') echo html::a($this->createLink('release', 'view', "releaseID=$release->id&type=bug&link=true"), ' ', '', "class='btn' title='{$lang->release->linkBug}'"); if(common::hasPriv('release', 'changeStatus', $release)) { $changedStatus = $release->status == 'normal' ? 'terminate' : 'normal'; - echo html::a($this->createLink('release', 'changeStatus', "releaseID=$release->id&status=$changedStatus", '', '', $this->session->program), ' ', 'hiddenwin', "class='btn' title='{$lang->release->changeStatusList[$changedStatus]}'"); + echo html::a($this->createLink('release', 'changeStatus', "releaseID=$release->id&status=$changedStatus"), ' ', 'hiddenwin', "class='btn' title='{$lang->release->changeStatusList[$changedStatus]}'"); } - common::printIcon('release', 'edit', "release=$release->id", $release, 'list', '', '', '', '', '', '', $this->session->program); + common::printIcon('release', 'edit', "release=$release->id", $release, 'list', '', '', '', ''); if(common::hasPriv('release', 'delete', $release)) { - $deleteURL = $this->createLink('release', 'delete', "releaseID=$release->id&confirm=yes", '', '', $this->session->program); + $deleteURL = $this->createLink('release', 'delete', "releaseID=$release->id&confirm=yes"); echo html::a("javascript:ajaxDelete(\"$deleteURL\", \"releaseList\", confirmDelete)", '', '', "class='btn' title='{$lang->release->delete}'"); } ?> diff --git a/module/release/view/view.html.php b/module/release/view/view.html.php index ee2ae815be..6a9439fd60 100644 --- a/module/release/view/view.html.php +++ b/module/release/view/view.html.php @@ -16,7 +16,7 @@ release->confirmUnlinkBug)?>
    @@ -121,7 +121,7 @@ createLink('release', 'unlinkStory', "releaseID=$release->id&story=$story->id", '', '', $this->session->program); + $unlinkURL = $this->createLink('release', 'unlinkStory', "releaseID=$release->id&story=$story->id"); echo html::a("javascript:ajaxDelete(\"$unlinkURL\", \"storyList\", confirmUnlinkStory)", '', '', "class='btn' title='{$lang->release->unlinkStory}'"); } ?> @@ -137,13 +137,13 @@ createLink('release', 'batchUnlinkStory', "release=$release->id", '', '', $this->session->program); + $unlinkURL = $this->createLink('release', 'batchUnlinkStory', "release=$release->id"); echo html::a('###', $lang->release->batchUnlink, '', "onclick='setFormAction(\"$unlinkURL\", \"hiddenwin\", this)' class='btn'"); } if(common::hasPriv('story', 'batchClose')) { - $closeURL = $this->createLink('story', 'batchClose', "productID=$release->product", '', '', $this->session->program); + $closeURL = $this->createLink('story', 'batchClose', "productID=$release->product"); echo html::a("###", $lang->story->batchClose, '', "onclick='setFormAction(\"$closeURL\", \"\", this)' class='btn'"); } ?> @@ -183,7 +183,7 @@
    @@ -206,7 +206,7 @@ createLink('release', 'unlinkBug', "releaseID=$release->id&bug=$bug->id", '', '', $this->session->program); + $unlinkURL = $this->createLink('release', 'unlinkBug', "releaseID=$release->id&bug=$bug->id"); echo html::a("javascript:ajaxDelete(\"$unlinkURL\", \"bugList\", confirmUnlinkBug)", '', '', "class='btn' title='{$lang->release->unlinkBug}'"); } ?> @@ -231,7 +231,7 @@
    id}, \"leftBug\")", ' ' . $lang->release->linkBug, '', "class='btn btn-primary'");?>
    - id&type=leftBug", '', '', $this->session->program);?>" id='linkedBugsForm' data-ride="table"> + id&type=leftBug");?>" id='linkedBugsForm' data-ride="table"> id}&type=leftBug&link=$link¶m=$param&orderBy=%s";?> @@ -266,7 +266,7 @@ ?> - createLink('bug', 'view', "bugID=$bug->id", '', true, $this->session->program);?> + createLink('bug', 'view', "bugID=$bug->id", '', true);?> diff --git a/module/story/model.php b/module/story/model.php index 33a0e46ed6..d2e7ae649f 100644 --- a/module/story/model.php +++ b/module/story/model.php @@ -2911,12 +2911,12 @@ class storyModel extends model break; } - common::printIcon('story', 'change', $vars, $story, 'list', 'fork', '', '', '', '', '', $this->session->program); - common::printIcon('story', 'review', $vars, $story, 'list', 'glasses', '', '', '', '', '', $this->session->program); - common::printIcon('story', 'close', $vars, $story, 'list', '', '', 'iframe', true, '', '', $this->session->program); - common::printIcon('story', 'edit', $vars, $story, 'list', '', '', '', '', '', '', $this->session->program); - if($this->config->global->flow != 'onlyStory') common::printIcon('story', 'createCase', "productID=$story->product&branch=$story->branch&module=0&from=¶m=0&$vars", $story, 'list', 'sitemap', '', '', '', '', '', $this->session->program); - common::printIcon('story', 'batchCreate', "productID=$story->product&branch=$story->branch&module=0&storyID=$story->id", $story, 'list', 'treemap-alt', '', '', '', '', $this->lang->story->subdivide, $this->session->program); + common::printIcon('story', 'change', $vars, $story, 'list', 'fork'); + common::printIcon('story', 'review', $vars, $story, 'list', 'glasses'); + common::printIcon('story', 'close', $vars, $story, 'list', '', '', 'iframe', true); + common::printIcon('story', 'edit', $vars, $story, 'list'); + if($this->config->global->flow != 'onlyStory') common::printIcon('story', 'createCase', "productID=$story->product&branch=$story->branch&module=0&from=¶m=0&$vars", $story, 'list', 'sitemap'); + common::printIcon('story', 'batchCreate', "productID=$story->product&branch=$story->branch&module=0&storyID=$story->id", $story, 'list', 'treemap-alt', '', '', '', '', $this->lang->story->subdivide); break; } echo ''; diff --git a/module/testcase/model.php b/module/testcase/model.php index 6c5179a43c..fac0eca46b 100644 --- a/module/testcase/model.php +++ b/module/testcase/model.php @@ -66,7 +66,7 @@ class testcaseModel extends model } if($exportTempletPriv) { - $link = helper::createLink('testcase', 'exportTemplet', "productID=$productID", '', '', $this->session->program); + $link = helper::createLink('testcase', 'exportTemplet', "productID=$productID"); $pageActions .= '
  • ' . html::a($link, $this->lang->testcase->exportTemplet, '', "class='export'") . '
    • '; } $pageActions .= ''; @@ -1397,7 +1397,7 @@ class testcaseModel extends model switch($id) { case 'id': - echo html::checkbox('caseIDList', array($case->id => '')) . html::a(helper::createLink('testcase', 'view', "caseID=$case->id", '', '', $this->session->program), sprintf('%03d', $case->id)); + echo html::checkbox('caseIDList', array($case->id => '')) . html::a(helper::createLink('testcase', 'view', "caseID=$case->id"), sprintf('%03d', $case->id)); break; case 'pri': echo ""; @@ -1407,7 +1407,7 @@ class testcaseModel extends model case 'title': if($case->branch) echo "{$branches[$case->branch]} "; if($modulePairs and $case->module) echo "{$modulePairs[$case->module]} "; - echo $canView ? ($fromCaseID ? html::a($caseLink, $case->title, null, "style='color: $case->color'") . html::a(helper::createLink('testcase', 'view', "caseID=$fromCaseID", '', '', $this->session->program), "[#$fromCaseID]") : html::a($caseLink, $case->title, null, "style='color: $case->color'")) : "$case->title"; + echo $canView ? ($fromCaseID ? html::a($caseLink, $case->title, null, "style='color: $case->color'") . html::a(helper::createLink('testcase', 'view', "caseID=$fromCaseID"), "[#$fromCaseID]") : html::a($caseLink, $case->title, null, "style='color: $case->color'")) : "$case->title"; break; case 'branch': echo $branches[$case->branch]; @@ -1438,7 +1438,7 @@ class testcaseModel extends model case 'story': static $stories = array(); if(empty($stories)) $stories = $this->dao->select('id,title')->from(TABLE_STORY)->where('deleted')->eq('0')->andWhere('product')->eq($case->product)->fetchPairs('id', 'title'); - if($case->story and isset($stories[$case->story])) echo html::a(helper::createLink('story', 'view', "storyID=$case->story", '', '', $this->session->program), $stories[$case->story]); + if($case->story and isset($stories[$case->story])) echo html::a(helper::createLink('story', 'view', "storyID=$case->story"), $stories[$case->story]); break; case 'precondition': echo $case->precondition; @@ -1479,10 +1479,10 @@ class testcaseModel extends model echo "" . $lastRunResultText . ""; break; case 'bugs': - echo (common::hasPriv('testcase', 'bugs') and $case->bugs) ? html::a(helper::createLink('testcase', 'bugs', "runID=0&caseID={$case->id}", '', '', $this->session->program), $case->bugs, '', "class='iframe'") : $case->bugs; + echo (common::hasPriv('testcase', 'bugs') and $case->bugs) ? html::a(helper::createLink('testcase', 'bugs', "runID=0&caseID={$case->id}"), $case->bugs, '', "class='iframe'") : $case->bugs; break; case 'results': - echo (common::hasPriv('testtask', 'results') and $case->results) ? html::a(helper::createLink('testtask', 'results', "runID=0&caseID={$case->id}", '', '', $this->session->program), $case->results, '', "class='iframe'") : $case->results; + echo (common::hasPriv('testtask', 'results') and $case->results) ? html::a(helper::createLink('testtask', 'results', "runID=0&caseID={$case->id}"), $case->results, '', "class='iframe'") : $case->results; break; case 'stepNumber': echo $case->stepNumber; @@ -1490,16 +1490,16 @@ class testcaseModel extends model case 'actions': if($case->needconfirm or $browseType == 'needconfirm') { - common::printIcon('testcase', 'confirmstorychange', "caseID=$case->id", $case, 'list', 'confirm', 'hiddenwin', '', '', '', $this->lang->confirm, $this->session->program); + common::printIcon('testcase', 'confirmstorychange', "caseID=$case->id", $case, 'list', 'confirm', 'hiddenwin', '', '', '', $this->lang->confirm); break; } - common::printIcon('testtask', 'results', "runID=0&caseID=$case->id", $case, 'list', '', '', 'iframe', true, "data-width='95%'", '', $this->session->program); - common::printIcon('testtask', 'runCase', "runID=0&caseID=$case->id&version=$case->version", $case, 'list', 'play', '', 'runCase iframe', false, "data-width='95%'", '', $this->session->program); - common::printIcon('testcase', 'edit', "caseID=$case->id", $case, 'list', '', '', '', '', '', '', $this->session->program); - if($this->config->testcase->needReview or !empty($this->config->testcase->forceReview)) common::printIcon('testcase', 'review', "caseID=$case->id", $case, 'list', 'glasses', '', 'iframe', '', '', '', $this->session->program); - common::printIcon('testcase', 'createBug', "product=$case->product&branch=$case->branch&extra=caseID=$case->id,version=$case->version,runID=", $case, 'list', 'bug', '', 'iframe', '', "data-width='90%'", '', $this->session->program); - common::printIcon('testcase', 'create', "productID=$case->product&branch=$case->branch&moduleID=$case->module&from=testcase¶m=$case->id", $case, 'list', 'copy', '', '', '', '', '', $this->session->program); + common::printIcon('testtask', 'results', "runID=0&caseID=$case->id", $case, 'list', '', '', 'iframe', true, "data-width='95%'"); + common::printIcon('testtask', 'runCase', "runID=0&caseID=$case->id&version=$case->version", $case, 'list', 'play', '', 'runCase iframe', false, "data-width='95%'"); + common::printIcon('testcase', 'edit', "caseID=$case->id", $case, 'list'); + if($this->config->testcase->needReview or !empty($this->config->testcase->forceReview)) common::printIcon('testcase', 'review', "caseID=$case->id", $case, 'list', 'glasses', '', 'iframe'); + common::printIcon('testcase', 'createBug', "product=$case->product&branch=$case->branch&extra=caseID=$case->id,version=$case->version,runID=", $case, 'list', 'bug', '', 'iframe', '', "data-width='90%'"); + common::printIcon('testcase', 'create', "productID=$case->product&branch=$case->branch&moduleID=$case->module&from=testcase¶m=$case->id", $case, 'list', 'copy'); break; } diff --git a/module/testcase/view/browse.html.php b/module/testcase/view/browse.html.php index 0ca9e02ecc..df5298eb6e 100644 --- a/module/testcase/view/browse.html.php +++ b/module/testcase/view/browse.html.php @@ -35,7 +35,7 @@ js::set('suiteID', $suiteID);
    - tree->manage, '', "class='btn btn-info btn-wide'", '', '', '', $this->session->program);?> + tree->manage, '', "class='btn btn-info btn-wide'");?>
    @@ -49,7 +49,7 @@ js::set('suiteID', $suiteID); testcase->noCase;?> - createLink('testcase', 'create', "productID=$productID&branch=$branch&moduleID=$initModule", '', '', $this->session->program), " " . $lang->testcase->create, '', "class='btn btn-info'");?> + createLink('testcase', 'create', "productID=$productID&branch=$branch&moduleID=$initModule"), " " . $lang->testcase->create, '', "class='btn btn-info'");?>

    diff --git a/module/testcase/view/caseheader.html.php b/module/testcase/view/caseheader.html.php index c23014ee5e..001a684f9c 100644 --- a/module/testcase/view/caseheader.html.php +++ b/module/testcase/view/caseheader.html.php @@ -8,7 +8,7 @@ echo !empty($moduleID) ? $moduleName : $this->lang->tree->all; if(!empty($moduleID)) { - $removeLink = $browseType == 'bymodule' ? $this->createLink('testcase', 'browse', "productID=$productID&branch=$branch&browseType=$browseType¶m=0&orderBy=$orderBy&recTotal=0&recPerPage={$pager->recPerPage}", '', '', $this->session->program) : 'javascript:removeCookieByKey("caseModule")'; + $removeLink = $browseType == 'bymodule' ? $this->createLink('testcase', 'browse', "productID=$productID&branch=$branch&browseType=$browseType¶m=0&orderBy=$orderBy&recTotal=0&recPerPage={$pager->recPerPage}") : 'javascript:removeCookieByKey("caseModule")'; echo html::a($removeLink, "", '', "class='text-muted'"); } ?> @@ -28,13 +28,13 @@ if($config->global->flow == 'onlyTest' and (strpos(',needconfirm,group,zerocase,', ',' . $menuType . ',') !== false)) continue; if($hasBrowsePriv and $menuType == 'QUERY') { - $searchBrowseLink = $this->createLink('testcase', 'browse', "productID=$productID&branch=$branch&browseType=bySearch¶m=%s", '', '', $this->session->program); + $searchBrowseLink = $this->createLink('testcase', 'browse', "productID=$productID&branch=$branch&browseType=bySearch¶m=%s"); $isBySearch = $browseType == 'bysearch'; include '../../common/view/querymenu.html.php'; } elseif($hasBrowsePriv and ($menuType == 'all' or $menuType == 'needconfirm' or $menuType == 'wait')) { - echo html::a($this->createLink('testcase', 'browse', "productid=$productID&branch=$branch&browseType=$menuType", '', '', $this->session->program), "{$menuItem->text}", '', "class='btn btn-link' id='{$menuType}Tab'"); + echo html::a($this->createLink('testcase', 'browse', "productid=$productID&branch=$branch&browseType=$menuType"), "{$menuItem->text}", '', "class='btn btn-link' id='{$menuType}Tab'"); } elseif($hasBrowsePriv and $menuType == 'suite') { @@ -49,7 +49,7 @@ if(empty($suiteList)) { echo '
  • '; - echo html::a($this->createLink('testsuite', 'create', "productID=$productID", '', '', $this->session->program), "" . $lang->testsuite->create); + echo html::a($this->createLink('testsuite', 'create', "productID=$productID"), "" . $lang->testsuite->create); echo '
    • '; } @@ -57,7 +57,7 @@ { $suiteName = $suite->name; echo ''; - echo html::a($this->createLink('testcase', 'browse', "productID=$productID&branch=$branch&browseType=bySuite¶m=$suiteID", '', '', $this->session->program), $suiteName); + echo html::a($this->createLink('testcase', 'browse', "productID=$productID&branch=$branch&browseType=bySuite¶m=$suiteID"), $suiteName); echo ""; } @@ -69,12 +69,12 @@ $active = !empty($groupBy) ? 'btn-active-text' : ''; echo "
    "; - echo html::a($this->createLink('testcase', 'groupCase', "productID=$productID&branch=$branch&groupBy=story", '', '', $this->session->program), "{$lang->testcase->groupByStories}", '', "class='btn btn-link $active'"); + echo html::a($this->createLink('testcase', 'groupCase', "productID=$productID&branch=$branch&groupBy=story"), "{$lang->testcase->groupByStories}", '', "class='btn btn-link $active'"); echo '
    '; } elseif($hasZeroPriv and $menuType == 'zerocase') { - echo html::a($this->createLink('story', 'zeroCase', "productID=$productID", '', '', $this->session->program), "{$lang->story->zeroCase}", '', "class='btn btn-link' id='zerocaseTab'"); + echo html::a($this->createLink('story', 'zeroCase', "productID=$productID"), "{$lang->story->zeroCase}", '', "class='btn btn-link' id='zerocaseTab'"); } ?> @@ -92,12 +92,12 @@ createLink('testcase', 'export', "productID=$productID&orderBy=$orderBy&taskID=0&browseType=$browseType", '', '', $this->session->program) : '#'; + $link = common::hasPriv('testcase', 'export') ? $this->createLink('testcase', 'export', "productID=$productID&orderBy=$orderBy&taskID=0&browseType=$browseType") : '#'; echo "
  • " . html::a($link, $lang->testcase->export, '', $misc) . "
    • "; $class = common::hasPriv('testcase', 'exportTemplet') ? '' : "class=disabled"; $misc = common::hasPriv('testcase', 'exportTemplet') ? "class='export'" : "class=disabled"; - $link = common::hasPriv('testcase', 'exportTemplet') ? $this->createLink('testcase', 'exportTemplet', "productID=$productID", '', '', $this->session->program) : '#'; + $link = common::hasPriv('testcase', 'exportTemplet') ? $this->createLink('testcase', 'exportTemplet', "productID=$productID") : '#'; echo "
  • " . html::a($link, $lang->testcase->exportTemplet, '', $misc) . "
    • "; ?> @@ -108,12 +108,12 @@ createLink('testcase', 'import', "productID=$productID&branch=$branch", '', '', $this->session->program) : '#'; + $link = common::hasPriv('testcase', 'import') ? $this->createLink('testcase', 'import', "productID=$productID&branch=$branch") : '#'; echo "
  • " . html::a($link, $lang->testcase->importFile, '', $misc) . "
    • "; $class = common::hasPriv('testcase', 'importFromLib') ? '' : "class=disabled"; $misc = common::hasPriv('testcase', 'importFromLib') ? '' : "class=disabled"; - $link = common::hasPriv('testcase', 'importFromLib') ? $this->createLink('testcase', 'importFromLib', "productID=$productID&branch=$branch", '', '', $this->session->program) : '#'; + $link = common::hasPriv('testcase', 'importFromLib') ? $this->createLink('testcase', 'importFromLib', "productID=$productID&branch=$branch") : '#'; echo "
  • " . html::a($link, $lang->testcase->importFromLib, '', $misc) . "
    • "; ?> @@ -123,20 +123,20 @@ createLink('testcase', 'batchCreate', "productID=$productID&branch=$branch&moduleID=$initModule", '', '', $this->session->program); + $link = $this->createLink('testcase', 'batchCreate', "productID=$productID&branch=$branch&moduleID=$initModule"); echo html::a($link, " " . $lang->testcase->batchCreate, '', "class='btn btn-secondary'"); } if(common::hasPriv('testcase', 'create')) { - $link = $this->createLink('testcase', 'create', "productID=$productID&branch=$branch&moduleID=$initModule", '', '', $this->session->program); + $link = $this->createLink('testcase', 'create', "productID=$productID&branch=$branch&moduleID=$initModule"); echo html::a($link, " " . $lang->testcase->create, '', "class='btn btn-primary'"); } ?>
    createLink('testcase', 'create', "productID=$productID&branch=$branch&moduleID=$initModule", '', '', $this->session->program) : '###'; + $link = common::hasPriv('testcase', 'create') ? $this->createLink('testcase', 'create', "productID=$productID&branch=$branch&moduleID=$initModule") : '###'; $disabled = common::hasPriv('testcase', 'create') ? '' : "disabled"; echo html::a($link, " {$lang->testcase->create} ", '', "class='btn btn-primary $disabled'"); ?> @@ -144,7 +144,7 @@
  • > createLink('testcase', 'batchCreate', "productID=$productID&branch=$branch&moduleID=$initModule", '', '', $this->session->program); + $batchLink = $this->createLink('testcase', 'batchCreate', "productID=$productID&branch=$branch&moduleID=$initModule"); echo "
  • " . html::a($batchLink, "" . $lang->testcase->batchCreate) . "
    • "; ?> diff --git a/module/testreport/view/browse.html.php b/module/testreport/view/browse.html.php index 0fbc297e15..a3f52a57dd 100644 --- a/module/testreport/view/browse.html.php +++ b/module/testreport/view/browse.html.php @@ -20,7 +20,7 @@
    - " . $lang->testreport->create, '', "class='btn btn-primary'", '', '', '', $this->session->program);?> + " . $lang->testreport->create, '', "class='btn btn-primary'", '');?>
    @@ -49,8 +49,8 @@     - - + + global->flow != 'onlyTest'):?> @@ -64,8 +64,8 @@ diff --git a/module/testsuite/view/browse.html.php b/module/testsuite/view/browse.html.php index 20a64dff16..9b68a8ebba 100644 --- a/module/testsuite/view/browse.html.php +++ b/module/testsuite/view/browse.html.php @@ -22,7 +22,7 @@
    - " . $lang->testsuite->create, '', "class='btn btn-primary'", '', '', '', $this->session->program);?> + " . $lang->testsuite->create, '', "class='btn btn-primary'", '');?>
    @@ -32,7 +32,7 @@

    testsuite->noTestsuite;?> - createLink('testsuite', 'create', "product=$productID", '', '', $this->session->program), " " . $lang->testsuite->create, '', "class='btn btn-info'");?> + createLink('testsuite', 'create', "product=$productID"), " " . $lang->testsuite->create, '', "class='btn btn-info'");?>

    @@ -52,23 +52,23 @@ - + - - + + global->flow != 'onlyTest'):?> - + @@ -102,15 +102,15 @@ $status = $this->session->testTaskVersionStatus;
    @@ -292,7 +292,7 @@ createLink('release', 'unlinkBug', "releaseID=$release->id&bug=$bug->id&type=leftBug", '', '', $this->session->program); + $unlinkURL = $this->createLink('release', 'unlinkBug', "releaseID=$release->id&bug=$bug->id&type=leftBug"); echo html::a("javascript:ajaxDelete(\"$unlinkURL\", \"leftBugList\", confirmUnlinkBug)", '', '', "class='btn' title='{$lang->release->unlinkBug}'"); } ?> @@ -336,7 +336,7 @@
    release->build;?> - project) ? html::a($this->createLink('build', 'view', "buildID=$release->buildID", '', '', $this->session->program), $release->buildName, '_blank') : $release->buildName;?> + project) ? html::a($this->createLink('build', 'view', "buildID=$release->buildID"), $release->buildName, '_blank') : $release->buildName;?>
    id", '', '', $this->session->program), sprintf('%03d', $report->id));?>id&from=$objectType", '', '', $this->session->program), $report->title)?>id"), sprintf('%03d', $report->id));?>id&from=$objectType"), $report->title)?> createdBy);?> createdDate, 2);?> id", '', 'list', '', '', '', '', '', '', $this->session->program); - common::printIcon('testreport', 'delete', "id=$report->id", '', 'list', 'trash', 'hiddenwin', '', '', '', '', $this->session->program); + common::printIcon('testreport', 'edit', "id=$report->id", '', 'list'); + common::printIcon('testreport', 'delete', "id=$report->id", '', 'list', 'trash', 'hiddenwin'); ?>
    id", '', '', $this->session->program), sprintf('%03d', $suite->id));?>id"), sprintf('%03d', $suite->id));?> type == 'public') echo "{$lang->testsuite->authorList['public']} ";?> type == 'private') echo "{$lang->testsuite->authorList['private']} ";?> - id", '', '', $this->session->program), $suite->name);?> + id"), $suite->name);?> desc;?> addedBy);?> addedDate;?> id", $suite, 'list', 'link', '', '', '', '', '', $this->session->program); - common::printIcon('testsuite', 'edit', "suiteID=$suite->id", $suite, 'list', '', '', '', '', '', '', $this->session->program); + common::printIcon('testsuite', 'linkCase', "suiteID=$suite->id", $suite, 'list', 'link'); + common::printIcon('testsuite', 'edit', "suiteID=$suite->id", $suite, 'list'); if(common::hasPriv('testsuite', 'delete', $suite)) { - $deleteURL = $this->createLink('testsuite', 'delete', "suiteID=$suite->id&confirm=yes", '', '', $this->session->program); + $deleteURL = $this->createLink('testsuite', 'delete', "suiteID=$suite->id&confirm=yes"); echo html::a("javascript:ajaxDelete(\"$deleteURL\", \"suiteList\", confirmDelete)", '', '', "title='{$lang->testsuite->delete}' class='btn'"); } ?> diff --git a/module/testtask/view/browse.html.php b/module/testtask/view/browse.html.php index 42c42b8bd8..970f3b41e3 100644 --- a/module/testtask/view/browse.html.php +++ b/module/testtask/view/browse.html.php @@ -30,13 +30,13 @@ $status = $this->session->testTaskVersionStatus;
      " . html::a($this->createLink('testtask', 'browse', "productID=$productID&branch=0&type=all,$status", '', '', $this->session->program), $lang->testtask->all) . ""; - echo "
    • " . html::a($this->createLink('testtask', 'browse', "productID=$productID&branch=$branch&type=local,$status", '', '', $this->session->program), $productName, '', "title='{$productName}' class='text-ellipsis'") . "
      • "; + echo "
    • " . html::a($this->createLink('testtask', 'browse', "productID=$productID&branch=0&type=all,$status"), $lang->testtask->all) . "
      • "; + echo "
    • " . html::a($this->createLink('testtask', 'browse', "productID=$productID&branch=$branch&type=local,$status"), $productName, '', "title='{$productName}' class='text-ellipsis'") . "
      • "; ?>
    testtask->featureBar['browse'] as $key => $label):?> - createLink('testtask', 'browse', "productID=$productID&branch=$branch&type=$scope,$key", '', '', $this->session->program), "$label", '', "id='{$key}Tab' class='btn btn-link'");?> + createLink('testtask', 'browse', "productID=$productID&branch=$branch&type=$scope,$key"), "$label", '', "id='{$key}Tab' class='btn btn-link'");?> recPerPage}&pageID=1"?>
    @@ -47,7 +47,7 @@ $status = $this->session->testTaskVersionStatus;
    - " . $lang->testtask->create, '', "class='btn btn-primary'", '', '', '', $this->session->program);?> + " . $lang->testtask->create, '', "class='btn btn-primary'");?>
    @@ -57,7 +57,7 @@ $status = $this->session->testTaskVersionStatus;

    testtask->noTesttask;?> - createLink('testtask', 'create', "product=$productID"), '', '', $this->session->program, " " . $lang->testtask->create, '', "class='btn btn-info'");?> + createLink('testtask', 'create', "product=$productID"), " " . $lang->testtask->create, '', "class='btn btn-info'");?>

    @@ -83,13 +83,13 @@ $status = $this->session->testTaskVersionStatus;
    createLink('testtask', 'cases', "taskID=$task->id", '', '', $this->session->program), sprintf('%03d', $task->id));?>createLink('testtask', 'cases', "taskID=$task->id", '', '', $this->session->program), $task->name);?>createLink('testtask', 'cases', "taskID=$task->id"), sprintf('%03d', $task->id));?>createLink('testtask', 'cases', "taskID=$task->id"), $task->name);?> productName?> projectName?> build == 'trunk' || empty($task->buildName)) ? $lang->trunk : html::a($this->createLink('build', 'view', "buildID=$task->build", '', true, $this->session->program), $task->buildName);?>build == 'trunk' || empty($task->buildName)) ? $lang->trunk : html::a($this->createLink('build', 'view', "buildID=$task->build", '', true), $task->buildName);?> owner);?> begin?> end?> '; - common::printIcon('testtask', 'cases', "taskID=$task->id", $task, 'list', 'sitemap', '', '', '', '', '', $this->session->program); - common::printIcon('testtask', 'linkCase', "taskID=$task->id", $task, 'list', 'link', '', '', '', '', '', $this->session->program); - common::printIcon('testreport', 'browse', "objectID=$task->product&objectType=product&extra=$task->id", $task, 'list','flag', '', '', '', '', '', $this->session->program); + common::printIcon('testtask', 'cases', "taskID=$task->id", $task, 'list', 'sitemap'); + common::printIcon('testtask', 'linkCase', "taskID=$task->id", $task, 'list', 'link'); + common::printIcon('testreport', 'browse', "objectID=$task->product&objectType=product&extra=$task->id", $task, 'list','flag'); echo ''; - common::printIcon('testtask', 'view', "taskID=$task->id", '', 'list', 'list-alt','','iframe',true, '', '', $this->session->program); - common::printIcon('testtask', 'edit', "taskID=$task->id", $task, 'list','','','',true, '', '', $this->session->program); + common::printIcon('testtask', 'view', "taskID=$task->id", '', 'list', 'list-alt','','iframe',true); + common::printIcon('testtask', 'edit', "taskID=$task->id", $task, 'list','','','',true); if(common::hasPriv('testtask', 'delete', $task)) { - $deleteURL = $this->createLink('testtask', 'delete', "taskID=$task->id&confirm=yes", '', '', $this->session->program); + $deleteURL = $this->createLink('testtask', 'delete', "taskID=$task->id&confirm=yes"); echo html::a("javascript:ajaxDelete(\"$deleteURL\",\"taskList\",confirmDelete)", '', '', "title='{$lang->testtask->delete}' class='btn'"); } ?>