From 71c7378abdeb0f1f3eaae743c3abf34f2e467dca Mon Sep 17 00:00:00 2001 From: tianshujie Date: Fri, 16 Jun 2023 09:00:16 +0800 Subject: [PATCH] - Delete search box of desgin menu. --- module/common/lang/menu.php | 11 +++++------ module/design/control.php | 30 ------------------------------ module/design/model.php | 2 -- 3 files changed, 5 insertions(+), 38 deletions(-) diff --git a/module/common/lang/menu.php b/module/common/lang/menu.php index fd10b69c8f..5be1c3c84a 100644 --- a/module/common/lang/menu.php +++ b/module/common/lang/menu.php @@ -309,12 +309,11 @@ $lang->waterfall->menu->qa['subMenu']->testtask = array('link' => "{$lang->tes $lang->waterfall->menu->qa['subMenu']->testreport = array('link' => "{$lang->testreport->common}|project|testreport|projectID=%s", 'subModule' => 'testreport'); $lang->waterfall->menu->design['subMenu'] = new stdclass(); -$lang->waterfall->menu->design['subMenu']->all = array('link' => "$lang->all|design|browse|projectID=%s&productID=0&browseType=all"); -$lang->waterfall->menu->design['subMenu']->hlds = array('link' => "{$lang->design->HLDS}|design|browse|projectID=%s&productID=0&browseType=HLDS"); -$lang->waterfall->menu->design['subMenu']->dds = array('link' => "{$lang->design->DDS}|design|browse|projectID=%s&productID=0&browseType=DDS"); -$lang->waterfall->menu->design['subMenu']->dbds = array('link' => "{$lang->design->DBDS}|design|browse|projectID=%s&productID=0&browseType=DBDS"); -$lang->waterfall->menu->design['subMenu']->ads = array('link' => "{$lang->design->ADS}|design|browse|projectID=%s&productID=0&browseType=ADS"); -$lang->waterfall->menu->design['subMenu']->bysearch = array('link' => ' ' . $lang->searchAB . ''); +$lang->waterfall->menu->design['subMenu']->all = array('link' => "$lang->all|design|browse|projectID=%s&productID=0&browseType=all"); +$lang->waterfall->menu->design['subMenu']->hlds = array('link' => "{$lang->design->HLDS}|design|browse|projectID=%s&productID=0&browseType=HLDS"); +$lang->waterfall->menu->design['subMenu']->dds = array('link' => "{$lang->design->DDS}|design|browse|projectID=%s&productID=0&browseType=DDS"); +$lang->waterfall->menu->design['subMenu']->dbds = array('link' => "{$lang->design->DBDS}|design|browse|projectID=%s&productID=0&browseType=DBDS"); +$lang->waterfall->menu->design['subMenu']->ads = array('link' => "{$lang->design->ADS}|design|browse|projectID=%s&productID=0&browseType=ADS"); /* Kanban project menu. */ $lang->kanbanProject = new stdclass(); diff --git a/module/design/control.php b/module/design/control.php index 73fd54fca9..4b15758639 100755 --- a/module/design/control.php +++ b/module/design/control.php @@ -87,36 +87,6 @@ class design extends control $actionURL = $this->createLink('design', 'browse', "projectID=$projectID&productID=$productID&type=bySearch&queryID=myQueryID"); $this->design->buildSearchForm($queryID, $actionURL); - /* Print top and right actions. */ - $this->lang->TRActions = '
'; - if($this->config->edition == 'max' and common::hasPriv('design', 'submit')) - { - $this->lang->TRActions .= '
'; - $this->lang->TRActions .= html::a($this->createLink('design', 'submit', "productID=$productID", '', true), " {$this->lang->design->submit}", '', "class='btn btn-secondary iframe'"); - $this->lang->TRActions .= '
'; - } - - if(common::hasPriv('design', 'create') and common::hasPriv('design', 'batchCreate')) - { - $this->lang->TRActions .= ''; - $this->lang->TRActions .= '
'; - } - else - { - if(common::hasPriv('design', 'create')) $this->lang->TRActions .= html::a(inlink('create', "projectID=$projectID&productID=$productID&type=$type"), " {$this->lang->design->create}", '', "class='btn btn-primary'"); - if(common::hasPriv('design', 'batchCreate')) $this->lang->TRActions .= html::a(inlink('batchCreate', "projectID=$projectID&productID=$productID&type=$type"), " {$this->lang->design->batchCreate}", '', "class='btn btn-primary'"); - } - /* Init pager and get designs. */ $this->app->loadClass('pager', true); $pager = pager::init(0, $recPerPage, $pageID); diff --git a/module/design/model.php b/module/design/model.php index aaed6195b1..e16d50aba8 100755 --- a/module/design/model.php +++ b/module/design/model.php @@ -427,8 +427,6 @@ class designModel extends model $count ++; } - if($this->app->rawMethod == 'browse') $this->lang->waterfall->menu->design['subMenu']->bysearch = array('link' => ' ' . $this->lang->searchAB . ''); - if(empty($products) || !$productID) return ''; if($productID)