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

Merge branch '15.0.beta3' of http://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3

Browse Source
This commit is contained in:
holan20180123
2021-04-01 15:30:00 +08:00
parent e6849940e9 3dd13d66c5
commit c9c22cdecd
55 changed files with 166 additions and 277 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/project/control.php
+3 -1
View File
@@ -110,6 +110,7 @@ class project extends control
$programs = $this->dao->select('id, name')->from(TABLE_PROGRAM)->where('type')->eq('program')->andWhere('deleted')->eq(0)->orderBy('order_asc')->fetchPairs();
$projects = $this->dao->select('*')->from(TABLE_PROJECT)
->where('deleted')->eq(0)
->andWhere('type')->eq('project')
->beginIF(!$this->app->user->admin)->andWhere('id')->in($this->app->user->view->projects)->fi()
->orderBy('order_asc')
->fetchAll('id');
@@ -489,7 +490,8 @@ class project extends control
*/
public function view($projectID = 0)
{
$project = $this->project->getById($projectID);
$projectID = (int)$projectID;
$project = $this->project->getById($projectID);
if(empty($project) || strpos('scrum,waterfall', $project->model) === false) die(js::error($this->lang->notFound) . js::locate('back'));
$this->project->setMenu($projectID);
module/project/js/create.js
+2 -2
View File
@@ -82,9 +82,9 @@ function addNewProduct(obj)
* @access public
* @return void
*/
function setAclList(projectID)
function setAclList(programID)
{
if(projectID != 0)
if(programID != 0)
{
$('.aclBox').html($('#programAcl').html());
}
module/project/js/edit.js
+1
View File
@@ -3,6 +3,7 @@ $(function()
$('#parent').change(function()
{
var programID = $(this).val();
setAclList(programID);
/* Determine whether the project can change the project set. */
link = createLink('project', 'ajaxCheckProduct', 'programID=' + programID + '&projectID=' + projectID);
module/project/lang/zh-cn.php
+2 -2
View File
@@ -170,8 +170,8 @@ $lang->project->aclList['open'] = "公开 (有项目视图权限即可访问)
$lang->project->acls['private'] = '私有';
$lang->project->acls['open'] = '公开';
$lang->project->authList['extend'] = '继承(取系统权限与项目权限的合集)';
$lang->project->authList['reset'] = '重新定义(只取项目权限)';
$lang->project->authList['extend'] = '继承 (取系统权限与项目权限的合集)';
$lang->project->authList['reset'] = '重新定义 (只取项目权限)';
$lang->project->statusList['wait'] = '未开始';
$lang->project->statusList['doing'] = '进行中';
module/project/view/create.html.php
+1 -1
View File
@@ -200,6 +200,6 @@
<?php echo nl2br(html::radio('acl', $lang->project->aclList, $acl, "onclick='setWhite(this.value);'", 'block'));?>
</div>
<div id='programAcl' class='hidden'>
<?php echo nl2br(html::radio('acl', $lang->program->aclList, $acl, "onclick='setWhite(this.value);'", 'block'));?>
<?php echo nl2br(html::radio('acl', $lang->program->subAclList, $acl, "onclick='setWhite(this.value);'", 'block'));?>
</div>
<?php include '../../common/view/footer.html.php';?>
module/project/view/edit.html.php
+1 -1
View File
@@ -173,7 +173,7 @@
<?php echo nl2br(html::radio('acl', $lang->project->aclList, $project->acl == 'project' ? 'private' : 'open', "onclick='setWhite(this.value);'", 'block'));?>
</div>
<div id='programAcl' class='hidden'>
<?php echo nl2br(html::radio('acl', $lang->project->aclList, $project->acl, "onclick='setWhite(this.value);'", 'block'));?>
<?php echo nl2br(html::radio('acl', $lang->program->subAclList, $project->acl, "onclick='setWhite(this.value);'", 'block'));?>
</div>
<div class="modal fade" id="promptBox">
<div class="modal-dialog mw-600px">