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

* Fix acl and rights.

Browse Source
This commit is contained in:
sgm0422
2020-06-12 16:41:40 +08:00
parent 2d97663c5d
commit 5c5ef4eb0c
12 changed files with 260 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/program/config.php
-4
View File
@@ -11,7 +11,3 @@ $config->program->editor->suspend = array('id' => 'comment', 'tools' => 'simple
$config->program->list = new stdclass();
$config->program->list->exportFields = 'id,name,code,type,category,status,begin,end,budget,PM,end,desc';
$config->program->priv = new stdclass();
$config->program->priv->scrum = array('product', 'story', 'productplan', 'release', 'project', 'task', 'build', 'qa', 'bug', 'testcase', 'testsuite', 'testreport', 'caselib', 'doc', 'report', 'repo', 'svn', 'git', 'search', 'tree', 'file', 'jenkins', 'job', 'ci', 'branch');
$config->program->priv->cmmi = $config->program->priv->scrum + array('workestimation', 'durationestimation', 'budget', 'programplan', 'review', 'reviewissue', 'weekly', 'milestone', 'design', 'issue', 'risk', 'auditplan', 'nc', 'cm', 'pssp');
module/program/control.php
+3 -12
View File
@@ -290,7 +290,7 @@ class program extends control
$this->group->sortResource();
$groupPrivs = $this->group->getPrivs($groupID);
$this->view->title = $this->lang->company->common . $this->lang->colon . $group->name . $this->lang->colon . $this->lang->group->managePriv;
$this->view->title = $group->name . $this->lang->colon . $this->lang->group->managePriv;
$this->view->position[] = $group->name;
$this->view->position[] = $this->lang->group->managePriv;
@@ -312,7 +312,7 @@ class program extends control
/* Unset not program privs. */
foreach($this->lang->resource as $method => $label)
{
if(!in_array($method, $this->config->program->priv->{$program->template})) unset($this->lang->resource->$method);
if(!in_array($method, $this->config->programPriv->{$program->template})) unset($this->lang->resource->$method);
}
}
@@ -340,7 +340,7 @@ class program extends control
$allUsers = $this->loadModel('dept')->getDeptUserPairs($deptID);
$otherUsers = array_diff_assoc($allUsers, $groupUsers);
$title = $this->lang->company->common . $this->lang->colon . $group->name . $this->lang->colon . $this->lang->group->manageMember;
$title = $group->name . $this->lang->colon . $this->lang->group->manageMember;
$position[] = $group->name;
$position[] = $this->lang->group->manageMember;
@@ -398,12 +398,6 @@ class program extends control
$roles = $this->user->getUserRoles(array_keys($users));
$deptUsers = $dept === '' ? array() : $this->dept->getDeptUserPairs($dept);
$currentMembers = $this->project->getTeamMembers($projectID);
//$members2Import = $this->project->getMembers2Import($team2Import, array_keys($currentMembers));
//$teams2Import = $this->project->getTeams2Import($this->app->user->account, $projectID);
//$teams2Import = array('' => '') + $teams2Import;
/* Set menu. */
//$this->project->setMenu($this->projects, $project->id);
$title = $this->lang->program->manageMembers . $this->lang->colon . $project->name;
$position[] = $this->lang->program->manageMembers;
@@ -417,9 +411,6 @@ class program extends control
$this->view->dept = $dept;
$this->view->depts = array('' => '') + $this->loadModel('dept')->getOptionMenu();
$this->view->currentMembers = $currentMembers;
//$this->view->members2Import = $members2Import;
//$this->view->teams2Import = $teams2Import;
//$this->view->team2Import = $team2Import;
$this->display();
}
module/program/lang/zh-cn.php
+2 -2
View File
@@ -29,13 +29,13 @@ $lang->program->realStarted = '实际开始日期';
$lang->program->bygrid = '看板';
$lang->program->bylist = '列表';
$lang->program->mine = '我参与的';
$lang->program->group = '分组列表';
$lang->program->group = '分组';
$lang->program->createGroup = '创建分组';
$lang->program->editGroup = '编辑分组';
$lang->program->copyGroup = '复制分组';
$lang->program->manageView = '维护视图';
$lang->program->managePriv = '维护权限';
$lang->program->manageMembers = '维护团队';
$lang->program->manageMembers = '团队';
$lang->program->transfer = '进入项目';
$lang->program->setPlanduration = '设置工期';
$lang->program->export = '导出';
module/program/model.php
+3 -3
View File
@@ -7,7 +7,7 @@ class programModel extends model
->where('iscat')->eq(0)
->andWhere('program')->eq(0)
->andWhere('deleted')->eq(0)
->beginIF(!$this->app->user->admin)->andWhere('id')->in($this->app->user->view->projects)->fi()
->beginIF(!$this->app->user->admin)->andWhere('id')->in($this->app->user->view->programs)->fi()
->beginIF($status != 'all')->andWhere('status')->eq($status)->fi()
->beginIF($this->cookie->mine)
->andWhere('openedBy', true)->eq($this->app->user->account)
@@ -25,7 +25,7 @@ class programModel extends model
->where('iscat')->eq(0)
->andWhere('program')->eq(0)
->andWhere('deleted')->eq(0)
->beginIF(!$this->app->user->admin)->andWhere('id')->in($this->app->user->view->projects)->fi()
->beginIF(!$this->app->user->admin)->andWhere('id')->in($this->app->user->view->programs)->fi()
->fetchPairs();
}
@@ -36,7 +36,7 @@ class programModel extends model
->andWhere('template')->eq($template)
->andWhere('program')->eq(0)
->andWhere('deleted')->eq(0)
->beginIF(!$this->app->user->admin)->andWhere('id')->in($this->app->user->view->projects)->fi()
->beginIF(!$this->app->user->admin)->andWhere('id')->in($this->app->user->view->programs)->fi()
->fetchPairs();
}
module/program/view/browsebygrid.html.php
+2
View File
@@ -14,6 +14,8 @@
<li class='dropdown'>
<a href='javascript:;' data-toggle='dropdown' class='panel-action'><i class='icon icon-ellipsis-v'></i></a>
<ul class='dropdown-menu pull-right'>
<li><?php common::printIcon('program', 'group', "projectID=$project->id", $project, 'button', 'group');?></li>
<li><?php common::printIcon('program', 'manageMembers', "projectID=$project->id", $project, 'button', 'persons');?></li>
<li><?php common::printicon('program', 'activate', "projectid=$project->id", $project, 'button', '', '', 'iframe', true);?></li>
<li><?php if(common::hasPriv('program', 'edit')) echo html::a($this->createLink("program", "edit", "projectID=$project->id"), "<i class='icon-edit'></i> " . $lang->edit, '', "");?></li>
<li><?php common::printIcon('program', 'start', "projectID=$project->id", $project, 'button', '', '', 'iframe', true);?></li>
module/program/view/browsebylist.html.php
+1 -1
View File
@@ -19,7 +19,7 @@
<th class='w-100px'><?php common::printOrderLink('end', $orderBy, $vars, $lang->program->end);?></th>
<th class='w-100px'><?php common::printOrderLink('budget', $orderBy, $vars, $lang->program->budget);?></th>
<th class='w-100px'><?php common::printOrderLink('PM', $orderBy, $vars, $lang->program->PM);?></th>
<th class='text-center w-200px'><?php echo $lang->actions;?></th>
<th class='text-center w-210px'><?php echo $lang->actions;?></th>
<?php if($canOrder):?>
<th class='w-60px sort-default'><?php common::printOrderLink('order', $orderBy, $vars, $lang->project->orderAB);?></th>
<?php endif;?>