From 35bcf01ff5bedbdb761e5222afcbcca6d0ab5713 Mon Sep 17 00:00:00 2001 From: liugang Date: Thu, 14 Jun 2018 14:34:41 +0800 Subject: [PATCH] * Replace $this->config with $config in view files. --- module/bug/view/batchcreate.html.php | 2 +- module/bug/view/batchedit.html.php | 2 +- module/bug/view/browse.html.php | 6 +++--- module/bug/view/create.html.php | 8 ++++---- module/bug/view/edit.html.php | 4 ++-- module/bug/view/sendmail.html.php | 2 +- module/bug/view/view.html.php | 4 ++-- module/build/view/edit.html.php | 2 +- module/build/view/view.html.php | 12 ++++++------ module/common/view/datatable.fix.html.php | 2 +- module/common/view/footer.html.php | 6 +++--- module/common/view/header.html.php | 8 ++++---- module/common/view/validation.html.php | 2 +- module/company/view/browse.html.php | 2 +- module/company/view/dynamic.html.php | 2 +- module/custom/view/ajaxmenu.html.php | 2 +- module/doc/view/objectlibs.html.php | 4 ++-- module/doc/view/showfiles.html.php | 2 +- module/mail/view/edit.html.php | 2 +- module/mail/view/sendcloud.html.php | 4 ++-- module/mail/view/ztcloud.html.php | 2 +- module/my/view/story.html.php | 2 +- module/product/view/batchedit.html.php | 2 +- module/product/view/browse.html.php | 2 +- module/product/view/index.html.php | 2 +- module/product/view/view.html.php | 2 +- module/project/view/batchedit.html.php | 2 +- module/project/view/create.html.php | 4 ++-- module/project/view/edit.html.php | 4 ++-- module/project/view/task.html.php | 2 +- module/project/view/tips.html.php | 2 +- module/project/view/treestory.html.php | 2 +- module/project/view/view.html.php | 4 ++-- module/qa/view/index.html.php | 2 +- module/release/view/browse.html.php | 2 +- module/release/view/view.html.php | 6 +++--- module/story/view/batchcreate.html.php | 2 +- module/story/view/sendmail.html.php | 2 +- module/story/view/view.html.php | 2 +- module/task/view/batchcreate.html.php | 6 +++--- module/task/view/batchedit.html.php | 2 +- module/task/view/create.html.php | 10 +++++----- module/task/view/sendmail.html.php | 2 +- module/testcase/view/batchcreate.html.php | 2 +- module/testcase/view/batchedit.html.php | 2 +- module/testcase/view/browse.html.php | 2 +- module/testcase/view/caseheader.html.php | 6 +++--- module/testcase/view/create.html.php | 2 +- module/testcase/view/edit.html.php | 2 +- module/testcase/view/importfromlib.html.php | 2 +- module/testcase/view/view.html.php | 2 +- module/testsuite/view/browse.html.php | 4 ++-- module/testsuite/view/linkcase.html.php | 2 +- module/testtask/view/browse.html.php | 8 ++++---- module/testtask/view/caseheader.html.php | 2 +- module/testtask/view/cases.html.php | 6 +++--- module/testtask/view/create.html.php | 2 +- module/testtask/view/edit.html.php | 2 +- module/testtask/view/sendmail.html.php | 2 +- module/testtask/view/view.html.php | 2 +- 60 files changed, 98 insertions(+), 98 deletions(-) diff --git a/module/bug/view/batchcreate.html.php b/module/bug/view/batchcreate.html.php index a5a763d9a5..502f6b7b32 100644 --- a/module/bug/view/batchcreate.html.php +++ b/module/bug/view/batchcreate.html.php @@ -32,7 +32,7 @@ { if($field) $visibleFields[$field] = ''; } - foreach(explode(',', $this->config->bug->create->requiredFields) as $field) + foreach(explode(',', $config->bug->create->requiredFields) as $field) { if($field) { diff --git a/module/bug/view/batchedit.html.php b/module/bug/view/batchedit.html.php index 87eb789aa5..0d704acb8d 100644 --- a/module/bug/view/batchedit.html.php +++ b/module/bug/view/batchedit.html.php @@ -32,7 +32,7 @@ { if($field)$visibleFields[$field] = ''; } - foreach(explode(',', $this->config->bug->edit->requiredFields) as $field) + foreach(explode(',', $config->bug->edit->requiredFields) as $field) { if($field) { diff --git a/module/bug/view/browse.html.php b/module/bug/view/browse.html.php index 31a9ccb8ed..91dcdbc595 100644 --- a/module/bug/view/browse.html.php +++ b/module/bug/view/browse.html.php @@ -16,12 +16,12 @@ include '../../common/view/datatable.fix.html.php'; js::set('browseType', $browseType); js::set('moduleID', $moduleID); js::set('bugBrowseType', ($browseType == 'bymodule' and $this->session->bugBrowseType == 'bysearch') ? 'all' : $this->session->bugBrowseType); -js::set('flow', $this->config->global->flow); +js::set('flow', $config->global->flow); js::set('productID', $productID); js::set('branch', $branch); $currentBrowseType = isset($lang->bug->mySelects[$browseType]) && in_array($browseType, array_keys($lang->bug->mySelects)) ? $browseType : ''; ?> -config->global->flow == 'full'):?> +global->flow == 'full'):?> - config->global->flow != 'onlyTest'):?> + global->flow != 'onlyTest'):?> bug->productplan;?> @@ -184,7 +184,7 @@ js::set('oldResolvedBuild' , $bug->resolvedBuild); - config->global->flow != 'onlyTest'):?> + global->flow != 'onlyTest'):?>
bug->legendPrjStoryTask;?>
diff --git a/module/bug/view/sendmail.html.php b/module/bug/view/sendmail.html.php index f949c6399e..77f09863db 100644 --- a/module/bug/view/sendmail.html.php +++ b/module/bug/view/sendmail.html.php @@ -18,7 +18,7 @@
color) ? '#333' : $bug->color;?> - config->mail, 'domain', common::getSysURL()) . helper::createLink('bug', 'view', "bugID=$bug->id"), $mailTitle, '', "style='color: {$color}; text-decoration: underline;'");?> + mail, 'domain', common::getSysURL()) . helper::createLink('bug', 'view', "bugID=$bug->id"), $mailTitle, '', "style='color: {$color}; text-decoration: underline;'");?>
diff --git a/module/bug/view/view.html.php b/module/bug/view/view.html.php index 3dbbbe3071..c58a90587f 100644 --- a/module/bug/view/view.html.php +++ b/module/bug/view/view.html.php @@ -288,7 +288,7 @@ - config->global->flow != 'onlyTest'):?> + global->flow != 'onlyTest'):?> toStory != 0):?> bug->toStory;?> @@ -328,7 +328,7 @@ $convertParams = "productID=$productID&branch=$bug->branch&moduleID=0&from=bug&b common::printIcon('bug', 'close', $params, $bug, 'button', '', '', 'text-danger iframe showinonlybody', true); common::printIcon('bug', 'activate', $params, $bug, 'button', '', '', 'text-success iframe showinonlybody', true); - if($this->config->global->flow != 'onlyTest') common::printIcon('bug', 'toStory', "product=$bug->product&branch=$bug->branch&module=0&story=0&project=0&bugID=$bug->id", $bug, 'button', $lang->icons['story']); + if($config->global->flow != 'onlyTest') common::printIcon('bug', 'toStory', "product=$bug->product&branch=$bug->branch&module=0&story=0&project=0&bugID=$bug->id", $bug, 'button', $lang->icons['story']); common::printIcon('bug', 'createCase', $convertParams, $bug, 'button', 'sitemap'); echo "
"; diff --git a/module/build/view/edit.html.php b/module/build/view/edit.html.php index 8c15ec5529..2a427f55d2 100644 --- a/module/build/view/edit.html.php +++ b/module/build/view/edit.html.php @@ -70,7 +70,7 @@ - config->global->flow != 'onlyTest' ? html::hidden('project', $build->project) : '';?> + global->flow != 'onlyTest' ? html::hidden('project', $build->project) : '';?> diff --git a/module/build/view/view.html.php b/module/build/view/view.html.php index c37e7d582e..a26e01a22d 100644 --- a/module/build/view/view.html.php +++ b/module/build/view/view.html.php @@ -13,7 +13,7 @@ build->confirmUnlinkStory)?> build->confirmUnlinkBug)?> -config->global->flow)?> +global->flow)?>