From ca21685f4b4c4d9cd24bf5d7a742935288c47690 Mon Sep 17 00:00:00 2001
From: sgm0422 <976204163@qq.com>
Date: Mon, 15 Jun 2020 14:35:21 +0800
Subject: [PATCH] * Fix project set menu.
---
module/product/model.php | 1 +
module/program/view/edit.html.php | 4 +++
module/project/model.php | 27 ++++++++++----------
module/project/view/ajaxgetdropmenu.html.php | 10 +++-----
4 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/module/product/model.php b/module/product/model.php
index 6dca55e7a3..51e3e010c7 100644
--- a/module/product/model.php
+++ b/module/product/model.php
@@ -300,6 +300,7 @@ class productModel extends model
$products = $this->dao->select('*, IF(INSTR(" closed", status) < 2, 0, 1) AS isClosed')
->from(TABLE_PRODUCT)
->where('deleted')->eq(0)
+ ->andWhere('program')->eq($this->session->program)
->beginIF(strpos($mode, 'noclosed') !== false)->andWhere('status')->ne('closed')->fi()
->beginIF(!$this->app->user->admin)->andWhere('id')->in($this->app->user->view->products)->fi()
->orderBy($orderBy)
diff --git a/module/program/view/edit.html.php b/module/program/view/edit.html.php
index 63306561fb..75677bf12f 100644
--- a/module/program/view/edit.html.php
+++ b/module/program/view/edit.html.php
@@ -81,6 +81,10 @@
desc, "rows='6' class='form-control kindeditor' hidefocus='true'");?>
+
+ | program->privway;?> |
+ program->privwayList, $project->privway, '', 'block');?> |
+
| project->acl;?> |
program->aclList, $project->acl, "onclick='setWhite(this.value);'", 'block'));?> |
diff --git a/module/project/model.php b/module/project/model.php
index abfd5db85d..82fe2ad3b6 100644
--- a/module/project/model.php
+++ b/module/project/model.php
@@ -118,8 +118,7 @@ class projectModel extends model
}
$projectIndex .= '';
-
- $this->lang->programSwapper = $selectHtml;
+ $projectIndex .= $selectHtml;
}
$this->lang->modulePageNav = $projectIndex;
@@ -169,23 +168,18 @@ class projectModel extends model
*/
public function select($projects, $projectID, $buildID, $currentModule, $currentMethod, $extra = '')
{
+ if(!$projectID) return;
+
$isMobile = $this->app->viewType == 'mhtml';
- $currentProjectName = '';
- if($projectID)
- {
- setCookie("lastProject", $projectID, $this->config->cookieLife, $this->config->webRoot, '', false, true);
- $currentProject = $this->getById($projectID);
- $currentProjectName = $currentProject->name;
- }
- else if($isMobile) return;
- else $currentProjectName = $this->lang->project->allProjects;
+ setCookie("lastProject", $projectID, $this->config->cookieLife, $this->config->webRoot, '', false, true);
+ $currentProject = $this->getById($projectID);
$dropMenuLink = helper::createLink('project', 'ajaxGetDropMenu', "objectID=$projectID&module=$currentModule&method=$currentMethod&extra=$extra");
- $output = "";
+ if($isMobile) $output = "{$currentProject->name} ";
return $output;
}
@@ -682,6 +676,7 @@ class projectModel extends model
/* Order by status's content whether or not done */
$projects = $this->dao->select('*, IF(INSTR(" done,closed", status) < 2, 0, 1) AS isDone')->from(TABLE_PROJECT)
->where('iscat')->eq(0)
+ ->andWhere('program')->eq($this->session->program)
->beginIF(strpos($mode, 'withdelete') === false)->andWhere('deleted')->eq(0)->fi()
->beginIF(!$this->app->user->admin)->andWhere('id')->in($this->app->user->view->projects)->fi()
->orderBy($orderBy)
@@ -736,6 +731,8 @@ class projectModel extends model
->where('t1.product')->eq($productID)
->andWhere('t2.deleted')->eq(0)
->andWhere('t2.iscat')->eq(0)
+ ->andWhere('t2.program')->eq($this->session->program)
+ ->andWhere('t2.template')->eq('')
->beginIF($status == 'undone')->andWhere('t2.status')->notIN('done,closed')->fi()
->beginIF($branch)->andWhere('t1.branch')->eq($branch)->fi()
->beginIF($status != 'all' and $status != 'undone')->andWhere('status')->in($status)->fi()
@@ -751,6 +748,8 @@ class projectModel extends model
->beginIF($status != 'all' and $status != 'undone')->andWhere('status')->in($status)->fi()
->beginIF(!$this->app->user->admin)->andWhere('id')->in($this->app->user->view->projects)->fi()
->andWhere('deleted')->eq(0)
+ ->andWhere('program')->eq($this->session->program)
+ ->andWhere('t2.template')->eq('')
->orderBy('order_desc')
->beginIF($limit)->limit($limit)->fi()
->fetchAll('id');
diff --git a/module/project/view/ajaxgetdropmenu.html.php b/module/project/view/ajaxgetdropmenu.html.php
index e5402fda1e..af3f7981f7 100644
--- a/module/project/view/ajaxgetdropmenu.html.php
+++ b/module/project/view/ajaxgetdropmenu.html.php
@@ -49,16 +49,12 @@ foreach($projects as $project)
?>