Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* Finish task #73818.

Browse Source
This commit is contained in:
wangyuting2
2022-10-27 06:45:09 +00:00
parent d6ad51dbb3
commit a1df161747
4 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
framework/router.class.php
+2 -2
View File
@@ -205,7 +205,7 @@ class router extends baseRouter
/* Record system mode. */
$config->systemMode = $mode;
$config->disabledFeatures = $disabledFeatures . $closedFeatures;
$config->disabledFeatures = $disabledFeatures . ',' . $closedFeatures;
/* Record system score.*/
$config->systemScore = $score;
@@ -226,7 +226,7 @@ class router extends baseRouter
/* User preference init. */
$config->URSR = $URSR;
$config->URAndSR = ($URAndSR and strpos(",{$disabledFeatures},", ',productURStory,') === false);
$config->URAndSR = ($URAndSR and strpos(",{$config->disabledFeatures},", ',productURStory,') === false);
$config->programLink = 'program-browse';
$config->productLink = 'product-all';
$config->projectLink = 'project-browse';
module/common/lang/menu.php
+6 -4
View File
@@ -170,12 +170,12 @@ $lang->product->menu->story = array('link' => "$lang->SRCommon|product|bro
$lang->product->menu->plan = array('link' => "{$lang->productplan->shortCommon}|productplan|browse|productID=%s", 'subModule' => 'productplan,bug');
$lang->product->menu->project = array('link' => "{$lang->project->common}|product|project|status=all&productID=%s");
$lang->product->menu->release = array('link' => "{$lang->release->common}|release|browse|productID=%s", 'subModule' => 'release');
$lang->product->menu->requirement = array('link' => "$lang->URCommon|product|browse|productID=%s&branch=&browseType=unclosed&param=0&storyType=requirement", 'alias' => 'batchedit', 'subModule' => 'story');
$lang->product->menu->roadmap = array('link' => "{$lang->roadmap}|product|roadmap|productID=%s");
$lang->product->menu->requirement = array('link' => "{$lang->URCommon}|product|browse|productID=%s&branch=&browseType=unclosed&param=0&storyType=requirement", 'alias' => 'batchedit', 'subModule' => 'story');
$lang->product->menu->track = array('link' => "{$lang->track}|product|track|productID=%s");
$lang->product->menu->doc = array('link' => "{$lang->doc->common}|doc|tableContents|type=product&objectID=%s", 'subModule' => 'doc');
$lang->product->menu->dynamic = array('link' => "{$lang->dynamic}|product|dynamic|productID=%s");
$lang->product->menu->settings = array('link' => "{$lang->settings}|product|view|productID=%s", 'subModule' => 'tree,branch', 'alias' => 'edit,whitelist,addwhitelist');
if($hasProductRoadmap) $lang->product->menu->roadmap = array('link' => "{$lang->roadmap}|product|roadmap|productID=%s");
if($hasProductTrack) $lang->product->menu->track = array('link' => "{$lang->track}|product|track|productID=%s");
/* Product menu order. */
$lang->product->menuOrder[5] = 'dashboard';
@@ -192,7 +192,9 @@ $lang->product->menuOrder[55] = 'settings';
$lang->product->menuOrder[60] = 'create';
$lang->product->menuOrder[65] = 'all';
if(!$config->URAndSR) unset($lang->product->menu->requirement, $lang->product->menuOrder[35]);
if(!$hasProductRoadmap) unset($lang->product->menu->roadmap, $lang->product->menuOrder[30]);
if(!$config->URAndSR) unset($lang->product->menu->requirement, $lang->product->menuOrder[35]);
if(!$hasProductTrack) unset($lang->product->menu->track, $lang->product->menuOrder[40]);
$lang->product->menu->doc['subMenu'] = new stdclass();
module/common/model.php
+3 -1
View File
@@ -335,8 +335,10 @@ class commonModel extends model
$this->config->personal = isset($config[$account]) ? $config[$account] : array();
/* Overide the items defined in config/config.php and config/my.php. */
if(isset($this->config->system->common)) $this->app->mergeConfig($this->config->system->common, 'common');
if(isset($this->config->system->common)) $this->app->mergeConfig($this->config->system->common, 'common');
if(isset($this->config->personal->common)) $this->app->mergeConfig($this->config->personal->common, 'common');
$this->config->disabledFeatures = $this->config->disabledFeatures . ',' . $this->config->closedFeatures;
}
/**
module/custom/view/flow.html.php
-2
View File
@@ -33,7 +33,6 @@
<div class="checkbox"> <?php echo html::radio('sprintConcept', $lang->custom->sprintConceptList, zget($this->config->custom, 'sprintConcept', '0'))?> </div>
</div>
</li>
<?php if(strpos(",{$this->config->disabledFeatures},", ',productURStory,') === false):?>
<li>
<div class="form-group">
@@ -42,7 +41,6 @@
</div>
</li>
<?php endif;?>
<?php if($this->config->edition != 'max'):?>
<li>
<div class="form-group">