diff --git a/module/bug/control.php b/module/bug/control.php index 771d04f704..e982938b20 100644 --- a/module/bug/control.php +++ b/module/bug/control.php @@ -658,7 +658,6 @@ class bug extends control elseif($from == 'repo') { session_write_close(); - $this->lang->set('menugroup.bug', 'repo'); $repos = $this->loadModel('repo')->getRepoPairs($this->session->PRJ); $this->repo->setMenu($repos); $this->lang->bug->menu = $this->lang->repo->menu; diff --git a/module/common/lang/de.php b/module/common/lang/de.php index 38427c0c35..be8732aebd 100644 --- a/module/common/lang/de.php +++ b/module/common/lang/de.php @@ -575,46 +575,6 @@ $lang->webhook = new stdclass(); $lang->message = new stdclass(); $lang->search = new stdclass(); -/* Menu group. */ -$lang->menugroup = new stdclass(); -$lang->menugroup->release = 'product'; -$lang->menugroup->story = 'product'; -$lang->menugroup->branch = 'product'; -$lang->menugroup->productplan = 'product'; -$lang->menugroup->task = 'project'; -$lang->menugroup->build = 'project'; -$lang->menugroup->convert = 'admin'; -$lang->menugroup->upgrade = 'admin'; -$lang->menugroup->user = 'company'; -$lang->menugroup->group = 'company'; -$lang->menugroup->bug = 'qa'; -$lang->menugroup->testcase = 'qa'; -$lang->menugroup->case = 'qa'; -$lang->menugroup->testtask = 'qa'; -$lang->menugroup->testsuite = 'qa'; -$lang->menugroup->caselib = 'qa'; -$lang->menugroup->testreport = 'qa'; -$lang->menugroup->report = 'reporting'; -$lang->menugroup->people = 'admin'; -$lang->menugroup->dept = 'company'; -$lang->menugroup->todo = 'my'; -$lang->menugroup->score = 'my'; -$lang->menugroup->action = 'admin'; -$lang->menugroup->backup = 'admin'; -$lang->menugroup->cron = 'admin'; -$lang->menugroup->extension = 'admin'; -$lang->menugroup->custom = 'admin'; -$lang->menugroup->mail = 'admin'; -$lang->menugroup->dev = 'admin'; -$lang->menugroup->entry = 'admin'; -$lang->menugroup->webhook = 'admin'; -$lang->menugroup->message = 'admin'; - -$lang->menugroup->repo = 'ci'; -$lang->menugroup->jenkins = 'ci'; -$lang->menugroup->compile = 'ci'; -$lang->menugroup->job = 'ci'; - /* Nav group.*/ $lang->navGroup = new stdclass(); $lang->navGroup->my = 'my'; diff --git a/module/common/lang/en.php b/module/common/lang/en.php index 087b5c8e6f..fd35da3641 100644 --- a/module/common/lang/en.php +++ b/module/common/lang/en.php @@ -577,45 +577,6 @@ $lang->webhook = new stdclass(); $lang->message = new stdclass(); $lang->search = new stdclass(); -/* Menu group. */ -$lang->menugroup = new stdclass(); -$lang->menugroup->release = 'product'; -$lang->menugroup->story = 'product'; -$lang->menugroup->branch = 'product'; -$lang->menugroup->productplan = 'product'; -$lang->menugroup->task = 'project'; -$lang->menugroup->build = 'project'; -$lang->menugroup->convert = 'admin'; -$lang->menugroup->upgrade = 'admin'; -$lang->menugroup->user = 'company'; -$lang->menugroup->group = 'company'; -$lang->menugroup->bug = 'qa'; -$lang->menugroup->testcase = 'qa'; -$lang->menugroup->case = 'qa'; -$lang->menugroup->testtask = 'qa'; -$lang->menugroup->testsuite = 'qa'; -$lang->menugroup->caselib = 'qa'; -$lang->menugroup->testreport = 'qa'; -$lang->menugroup->people = 'admin'; -$lang->menugroup->dept = 'company'; -$lang->menugroup->todo = 'my'; -$lang->menugroup->score = 'my'; -$lang->menugroup->action = 'admin'; -$lang->menugroup->backup = 'admin'; -$lang->menugroup->cron = 'admin'; -$lang->menugroup->extension = 'admin'; -$lang->menugroup->custom = 'admin'; -$lang->menugroup->mail = 'admin'; -$lang->menugroup->dev = 'admin'; -$lang->menugroup->entry = 'admin'; -$lang->menugroup->webhook = 'admin'; -$lang->menugroup->message = 'admin'; - -$lang->menugroup->repo = 'ci'; -$lang->menugroup->jenkins = 'ci'; -$lang->menugroup->compile = 'ci'; -$lang->menugroup->job = 'ci'; - /* Nav group.*/ $lang->navGroup = new stdclass(); $lang->navGroup->my = 'my'; diff --git a/module/common/lang/fr.php b/module/common/lang/fr.php index 863cfc70db..0649e51949 100644 --- a/module/common/lang/fr.php +++ b/module/common/lang/fr.php @@ -567,45 +567,6 @@ $lang->webhook = new stdclass(); $lang->message = new stdclass(); $lang->search = new stdclass(); -/* Menu group. */ -$lang->menugroup = new stdclass(); -$lang->menugroup->release = 'product'; -$lang->menugroup->story = 'product'; -$lang->menugroup->branch = 'product'; -$lang->menugroup->productplan = 'product'; -$lang->menugroup->task = 'project'; -$lang->menugroup->build = 'project'; -$lang->menugroup->convert = 'admin'; -$lang->menugroup->upgrade = 'admin'; -$lang->menugroup->user = 'company'; -$lang->menugroup->group = 'company'; -$lang->menugroup->bug = 'qa'; -$lang->menugroup->testcase = 'qa'; -$lang->menugroup->case = 'qa'; -$lang->menugroup->testtask = 'qa'; -$lang->menugroup->testsuite = 'qa'; -$lang->menugroup->caselib = 'qa'; -$lang->menugroup->testreport = 'qa'; -$lang->menugroup->people = 'admin'; -$lang->menugroup->dept = 'company'; -$lang->menugroup->todo = 'my'; -$lang->menugroup->score = 'my'; -$lang->menugroup->action = 'admin'; -$lang->menugroup->backup = 'admin'; -$lang->menugroup->cron = 'admin'; -$lang->menugroup->extension = 'admin'; -$lang->menugroup->custom = 'admin'; -$lang->menugroup->mail = 'admin'; -$lang->menugroup->dev = 'admin'; -$lang->menugroup->entry = 'admin'; -$lang->menugroup->webhook = 'admin'; -$lang->menugroup->message = 'admin'; - -$lang->menugroup->repo = 'ci'; -$lang->menugroup->jenkins = 'ci'; -$lang->menugroup->compile = 'ci'; -$lang->menugroup->job = 'ci'; - /* Nav group.*/ $lang->navGroup = new stdclass(); $lang->navGroup->my = 'my'; diff --git a/module/common/lang/vi.php b/module/common/lang/vi.php index b607d3c952..8ebf527bc8 100644 --- a/module/common/lang/vi.php +++ b/module/common/lang/vi.php @@ -573,45 +573,6 @@ $lang->webhook = new stdclass(); $lang->message = new stdclass(); $lang->search = new stdclass(); -/* Menu group. */ -$lang->menugroup = new stdclass(); -$lang->menugroup->release = 'product'; -$lang->menugroup->story = 'product'; -$lang->menugroup->branch = 'product'; -$lang->menugroup->productplan = 'product'; -$lang->menugroup->task = 'project'; -$lang->menugroup->build = 'project'; -$lang->menugroup->convert = 'admin'; -$lang->menugroup->upgrade = 'admin'; -$lang->menugroup->user = 'company'; -$lang->menugroup->group = 'company'; -$lang->menugroup->bug = 'qa'; -$lang->menugroup->testcase = 'qa'; -$lang->menugroup->case = 'qa'; -$lang->menugroup->testtask = 'qa'; -$lang->menugroup->testsuite = 'qa'; -$lang->menugroup->caselib = 'qa'; -$lang->menugroup->testreport = 'qa'; -$lang->menugroup->people = 'admin'; -$lang->menugroup->dept = 'company'; -$lang->menugroup->todo = 'my'; -$lang->menugroup->score = 'my'; -$lang->menugroup->action = 'admin'; -$lang->menugroup->backup = 'admin'; -$lang->menugroup->cron = 'admin'; -$lang->menugroup->extension = 'admin'; -$lang->menugroup->custom = 'admin'; -$lang->menugroup->mail = 'admin'; -$lang->menugroup->dev = 'admin'; -$lang->menugroup->entry = 'admin'; -$lang->menugroup->webhook = 'admin'; -$lang->menugroup->message = 'admin'; - -$lang->menugroup->repo = 'ci'; -$lang->menugroup->jenkins = 'ci'; -$lang->menugroup->compile = 'ci'; -$lang->menugroup->job = 'ci'; - /* Nav group.*/ $lang->navGroup = new stdclass(); $lang->navGroup->my = 'my'; diff --git a/module/common/lang/zh-tw.php b/module/common/lang/zh-tw.php index 93208c2619..49b27fd9e1 100644 --- a/module/common/lang/zh-tw.php +++ b/module/common/lang/zh-tw.php @@ -576,43 +576,7 @@ $lang->message = new stdclass(); $lang->search = new stdclass(); /* 菜單分組。*/ -$lang->menugroup = new stdclass(); -$lang->menugroup->release = 'product'; -$lang->menugroup->story = 'product'; -$lang->menugroup->branch = 'product'; -$lang->menugroup->productplan = 'product'; -$lang->menugroup->task = 'project'; -$lang->menugroup->build = 'project'; -$lang->menugroup->convert = 'admin'; -$lang->menugroup->upgrade = 'admin'; -$lang->menugroup->user = 'company'; -$lang->menugroup->group = 'company'; -$lang->menugroup->bug = 'qa'; -$lang->menugroup->testcase = 'qa'; -$lang->menugroup->case = 'qa'; -$lang->menugroup->testtask = 'qa'; -$lang->menugroup->testsuite = 'qa'; -$lang->menugroup->caselib = 'qa'; -$lang->menugroup->testreport = 'qa'; -$lang->menugroup->people = 'admin'; -$lang->menugroup->dept = 'company'; -$lang->menugroup->todo = 'my'; -$lang->menugroup->score = 'my'; -$lang->menugroup->action = 'admin'; -$lang->menugroup->backup = 'admin'; -$lang->menugroup->cron = 'admin'; -$lang->menugroup->extension = 'admin'; -$lang->menugroup->custom = 'admin'; -$lang->menugroup->mail = 'admin'; -$lang->menugroup->dev = 'admin'; -$lang->menugroup->entry = 'admin'; -$lang->menugroup->webhook = 'admin'; -$lang->menugroup->message = 'admin'; -$lang->menugroup->repo = 'ci'; -$lang->menugroup->jenkins = 'ci'; -$lang->menugroup->compile = 'ci'; -$lang->menugroup->job = 'ci'; /* Nav group.*/ $lang->navGroup = new stdclass(); diff --git a/module/common/model.php b/module/common/model.php index 758ba87e4a..4ac68b40b6 100644 --- a/module/common/model.php +++ b/module/common/model.php @@ -896,7 +896,6 @@ class commonModel extends model { global $lang; $mainMenu = $moduleName; - if(isset($lang->menugroup->$moduleName)) $mainMenu = $lang->menugroup->$moduleName; echo "