* Code for task #7235.

module/program/config.php

@@ -13,6 +13,5 @@ $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->scrum = array('program', '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');
-//$config->program->commonMethod = array('index', 'my', 'todo', 'company', 'dept', 'group', 'user', 'admin', 'extension', 'custom', 'action', 'mail', 'api', 'misc', 'backup', 'cron', 'dev', 'message', 'webhook');

module/program/control.php

@@ -104,6 +104,7 @@ class program extends control
         $team         = '';
         $whitelist    = '';
         $acl          = 'open';
+        $privway      = 'extend';
         if($copyProgramID)
         {
             $copyProgram = $this->dao->select('*')->from(TABLE_PROJECT)->where('id')->eq($copyProgramID)->fetch();
@@ -111,6 +112,7 @@ class program extends control
             $code        = $copyProgram->code;
             $team        = $copyProgram->team;
             $acl         = $copyProgram->acl;
+            $privway     = $copyProgram->privway;
             $whitelist   = $copyProgram->whitelist;
         }
 
@@ -124,6 +126,7 @@ class program extends control
         $this->view->code          = $code;
         $this->view->team          = $team;
         $this->view->acl           = $acl;
+        $this->view->privway       = $privway;
         $this->view->whitelist     = $whitelist;
         $this->view->copyProgramID = $copyProgramID;
         $this->display();

module/program/lang/zh-cn.php

@@ -39,6 +39,7 @@ $lang->program->manageMembers   = '维护团队';
 $lang->program->transfer        = '进入项目';
 $lang->program->setPlanduration = '设置工期';
 $lang->program->export          = '导出';
+$lang->program->privway         = '权限控制';
 
 $lang->program->manageGroupMember  = '维护分组用户';
 $lang->program->durationEstimation = '工作量估算';
@@ -64,6 +65,9 @@ $lang->program->aclList['open']    = "默认设置(有项目视图权限，即
 $lang->program->aclList['private'] = "私有项目(只有项目团队成员才能访问)";
 $lang->program->aclList['custom']  = "自定义白名单(团队成员和白名单的成员可以访问)";
 
+$lang->program->privwayList['extend'] = '继承(取项目权限与组织权限的并集)';
+$lang->program->privwayList['reset']  = '重新定义(只取项目权限)';
+
 $lang->program->chooseProgramType = '选择项目管理方式';
 $lang->program->nextStep          = '下一步';
 $lang->program->hoursUnit         = '%s工时';

module/program/view/create.html.php

@@ -113,6 +113,10 @@
             <?php echo html::textarea('desc', '', "rows='6' class='form-control kindeditor' hidefocus='true'");?>
           </td>
         </tr>
+        <tr>
+          <th><?php echo $lang->program->privway;?></th>
+          <td colspan='3'><?php echo html::radio('privway', $lang->program->privwayList, $privway, '', 'block');?></td>
+        </tr>
         <tr>
           <th><?php echo $lang->project->acl;?></th>
           <td colspan='3'><?php echo nl2br(html::radio('acl', $lang->program->aclList, $acl, "onclick='setWhite(this.value);'", 'block'));?></td>