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

Merge branch 'devops24_liyuchun' into 'devops24'

Browse Source 
Fix bug 20580.

See merge request easycorp/zentaopms!2404
This commit is contained in:
孙广明
2022-03-22 00:35:07 +00:00
parent fe214852d4 8b2d19b30c
commit e43dddd2dd
2 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
module/common/model.php
View File

@@ -2198,7 +2198,12 @@ EOD;
$method = $this->app->rawMethod;
}
if(!empty($this->app->user->modifyPassword) and (($module != 'user' or $method != 'deny') and ($module != 'my' or $method != 'changepassword') and ($module != 'user' or $method != 'logout'))) return print(js::locate(helper::createLink('my', 'changepassword', '', '', true)));
$beforeValidMethods = array(
'user' => array('deny', 'logout'),
'my' => array('changepassword'),
'message' => array('ajaxgetmessage'),
);
if(!empty($this->app->user->modifyPassword) and (!isset($beforeValidMethods[$module]) or !in_array($method, $beforeValidMethods[$module]))) return print(js::locate(helper::createLink('my', 'changepassword', '', '', true)));
if($this->isOpenMethod($module, $method)) return true;
if(!$this->loadModel('user')->isLogon() and $this->server->php_auth_user) $this->user->identifyByPhpAuth();
if(!$this->loadModel('user')->isLogon() and $this->cookie->za) $this->user->identifyByCookie();

10
module/custom/config.php
View File

@@ -12,12 +12,12 @@ $config->custom->canAdd['project'] = 'unitList';
$config->custom->noModuleMenu = array();
$config->custom->requiredModules[10] = 'project';
$config->custom->requiredModules[15] = 'product';
$config->custom->requiredModules[20] = 'story';
$config->custom->requiredModules[25] = 'productplan';
$config->custom->requiredModules[30] = 'release';
$config->custom->requiredModules[10] = 'product';
$config->custom->requiredModules[15] = 'story';
$config->custom->requiredModules[20] = 'productplan';
$config->custom->requiredModules[25] = 'release';
if($config->systemMode == 'new') $config->custom->requiredModules[30] = 'project';
$config->custom->requiredModules[35] = 'execution';
$config->custom->requiredModules[40] = 'task';
$config->custom->requiredModules[45] = 'build';