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

* Finish task #69016.

Browse Source
This commit is contained in:
liuruogu
2022-09-15 05:12:30 +00:00
parent 04cd8275fe
commit 04824e964b
8 changed files with 17 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/project/control.php
+1 -8
View File
@@ -851,14 +851,6 @@ class project extends control
$this->executeHooks($projectID);
if(empty($project->hasProduct))
{
$projectProduct = $this->dao->select('product')->from(TABLE_PROJECTPRODUCT)->where('project')->eq($projectID)->fetch()->product;
$this->lang->project->moduleMenu['link'] = sprintf($this->lang->project->moduleMenu['link'], $projectProduct);
$this->lang->project->menu->settings['subMenu']->tree = $this->lang->project->moduleMenu;
unset($this->lang->project->menu->settings['subMenu']->products);
}
$this->view->title = $this->lang->project->view;
$this->view->position = $this->lang->project->view;
$this->view->projectID = $projectID;
@@ -1992,6 +1984,7 @@ class project extends control
{
$projectID = $this->project->setMenu($projectID);
$project = $this->project->getById($projectID);
if(isset($project->acl) and $project->acl == 'open') $this->locate($this->createLink('project', 'index', "projectID=$projectID"));
echo $this->fetch('personnel', 'whitelist', "objectID=$projectID&module=$module&browseType=$objectType&orderBy=$orderBy&recTotal=$recTotal&recPerPage=$recPerPage&pageID=$pageID&projectID=$projectID&from=$from");
module/project/lang/de.php
-2
View File
@@ -341,5 +341,3 @@ $lang->project->confirmUnlinkMember = "Do you want to remove this user from pro
$lang->project->action = new stdclass();
$lang->project->action->managed = '$date, managed by <strong>$actor</strong>. $extra' . "\n";
$lang->project->moduleMenu = array('link' => 'Module|tree|browse|product=%s&view=story');
module/project/lang/en.php
-2
View File
@@ -341,5 +341,3 @@ $lang->project->confirmUnlinkMember = "Do you want to remove this user from proj
$lang->project->action = new stdclass();
$lang->project->action->managed = '$date, managed by <strong>$actor</strong>. $extra' . "\n";
$lang->project->moduleMenu = array('link' => 'Module|tree|browse|product=%s&view=story');
module/project/lang/fr.php
-2
View File
@@ -341,5 +341,3 @@ $lang->project->confirmUnlinkMember = "Do you want to remove this user from pro
$lang->project->action = new stdclass();
$lang->project->action->managed = '$date, managed by <strong>$actor</strong>. $extra' . "\n";
$lang->project->moduleMenu = array('link' => 'Module|tree|browse|product=%s&view=story');
module/project/lang/vi.php
-2
View File
@@ -241,5 +241,3 @@ $lang->project->childLongTime = "There are long-term projects in the child p
$lang->project->action = new stdclass();
$lang->project->action->managed = '$date, managed by <strong>$actor</strong>. $extra' . "\n";
$lang->project->moduleMenu = array('link' => 'Module|tree|browse|product=%s&view=story');
module/project/lang/zh-cn.php
-2
View File
@@ -341,5 +341,3 @@ $lang->project->confirmUnlinkMember = "您确定从该项目中移除该用户
$lang->project->action = new stdclass();
$lang->project->action->managed = '$date, 由 <strong>$actor</strong> 维护。$extra' . "\n";
$lang->project->moduleMenu = array('link' => '模块|tree|browse|product=%s&view=story');
module/project/model.php
+12
View File
@@ -2436,6 +2436,7 @@ class projectModel extends model
$model = 'scrum';
$objectID = (empty($objectID) and $this->session->project) ? $this->session->project : $objectID;
$project = $this->getByID($objectID);
if($project and $project->model == 'waterfall') $model = $project->model;
if($project and $project->model == 'kanban')
{
@@ -2451,6 +2452,17 @@ class projectModel extends model
$lang->project->dividerMenu = $lang->{$model}->dividerMenu;
}
if(empty($project->hasProduct))
{
unset($this->lang->project->menu->settings['subMenu']->products);
$projectProduct = $this->dao->select('product')->from(TABLE_PROJECTPRODUCT)->where('project')->eq($objectID)->fetch()->product;
$this->lang->project->menu->settings['subMenu']->module['link'] = sprintf($this->lang->project->menu->settings['subMenu']->module['link'], $projectProduct);
}
else
{
unset($this->lang->project->menu->settings['subMenu']->module);
}
/* Reset project priv. */
$moduleName = $this->app->rawModule;
$methodName = $this->app->rawMethod;