Merge branch 'master' of https://git.zcorp.cc/zentaopms

module/project/control.php

@@ -1107,7 +1107,7 @@ class project extends control
         $team         = '';
         $products     = array();
         $whitelist    = '';
-        $acl          = 'open';
+        $acl          = 'private';
         $plan         = new stdClass();
         $productPlan  = array();
         $productPlans = array();

module/project/lang/de.php

@@ -117,8 +117,8 @@ $lang->project->statusList['doing']     = 'In Arbeit';
 $lang->project->statusList['suspended'] = 'Ausgesetzt';
 $lang->project->statusList['closed']    = 'Geschlossen';
 
-$lang->project->aclList['open']    = 'Inherited Project ACL (for who can access the current project)';
 $lang->project->aclList['private'] = 'Private (for team members and project stakeholders)';
+$lang->project->aclList['open']    = 'Inherited Project ACL (for who can access the current project)';
 
 $lang->project->storyPoint = 'Story Point';
 

module/project/lang/en.php

@@ -117,8 +117,8 @@ $lang->project->statusList['doing']     = 'Doing';
 $lang->project->statusList['suspended'] = 'Suspended';
 $lang->project->statusList['closed']    = 'Closed';
 
-$lang->project->aclList['open']    = 'Inherited Project ACL (for who can access the current project)';
 $lang->project->aclList['private'] = 'Private (for team members and project stakeholders)';
+$lang->project->aclList['open']    = 'Inherited Project ACL (for who can access the current project)';
 
 $lang->project->storyPoint = 'Story Point';
 

module/project/lang/fr.php

@@ -117,8 +117,8 @@ $lang->project->statusList['doing']     = 'En cours';
 $lang->project->statusList['suspended'] = 'Suspendu';
 $lang->project->statusList['closed']    = 'Fermé';
 
-$lang->project->aclList['open']    = 'Inherited Project ACL (for who can access the current project)';
 $lang->project->aclList['private'] = 'Private (for team members and project stakeholders)';
+$lang->project->aclList['open']    = 'Inherited Project ACL (for who can access the current project)';
 
 $lang->project->storyPoint = 'Story Point';
 

module/project/lang/vi.php

@@ -117,8 +117,8 @@ $lang->project->statusList['doing']     = 'Đang làm';
 $lang->project->statusList['suspended'] = 'Đã đình chỉ';
 $lang->project->statusList['closed']    = 'Đã đóng';
 
-$lang->project->aclList['open']    = 'Inherited Project ACL (for who can access the current project)';
 $lang->project->aclList['private'] = 'Private (for team members and project stakeholders)';
+$lang->project->aclList['open']    = 'Inherited Project ACL (for who can access the current project)';
 
 $lang->project->storyPoint = 'Story Point';
 

module/project/lang/zh-cn.php

@@ -117,8 +117,8 @@ $lang->project->statusList['doing']     = '进行中';
 $lang->project->statusList['suspended'] = '已挂起';
 $lang->project->statusList['closed']    = '已关闭';
 
-$lang->project->aclList['open']    = "继承项目访问权限（能访问当前项目，即可访问）";
 $lang->project->aclList['private'] = "私有（团队成员和项目负责人、干系人可访问）";
+$lang->project->aclList['open']    = "继承项目访问权限（能访问当前项目，即可访问）";
 
 $lang->project->storyPoint = '故事点';
 

module/project/lang/zh-tw.php

@@ -114,8 +114,8 @@ $lang->project->statusList['doing']     = '進行中';
 $lang->project->statusList['suspended'] = '已掛起';
 $lang->project->statusList['closed']    = '已關閉';
 
-$lang->project->aclList['open']    = "繼承項目訪問權限（能訪問當前項目，即可訪問）";
 $lang->project->aclList['private'] = "私有（團隊成員和項目負責人、干係人可訪問）";
+$lang->project->aclList['open']    = "繼承項目訪問權限（能訪問當前項目，即可訪問）";
 
 $lang->project->storyPoint = '故事點';
 

module/projectbuild/js/browse.js

@@ -3,7 +3,7 @@ $(function()
     $('#createBuildButton').on('click', function()
     {
         var projectID = $('#project').val();
-        parent.location.href = createLink('build', 'create', 'projectID=' + projectID);
+        parent.location.href = createLink('build', 'create', 'projectID=' + projectID, '', '', PRJID);
     })
 });
 /**

module/projectbuild/view/browse.html.php

@@ -13,6 +13,7 @@
 <?php include '../../common/view/header.html.php';?>
 <?php js::set('confirmDelete', $lang->build->confirmDelete)?>
 <?php js::set('projectID', $projectID)?>
+<?php js::set('PRJID', $this->session->PRJ)?>
 <div id="mainMenu" class="clearfix table-row">
   <div class="btn-toolbar pull-left">
     <?php

module/testtask/js/common.js

@@ -81,7 +81,7 @@ function loadProjectBuilds(projectID)
 {
     selectedBuild = $('#build').val();
     if(!selectedBuild) selectedBuild = 0;
-    link = createLink('build', 'ajaxGetProjectBuilds', 'projectID=' + projectID + '&productID=' + $('#product').val() + '&varName=testTaskBuild&build=' + selectedBuild);
+    link = createLink('build', 'ajaxGetProjectBuilds', 'projectID=' + projectID + '&productID=' + $('#product').val() + '&varName=testTaskBuild&build=' + selectedBuild, '', '', PRJID);
     if(projectID == 0) link = createLink('build', 'ajaxGetProductBuilds', 'productID=' + $('#product').val() + '&varName=resolvedBuild&build=' + selectedBuild);
     $('#buildBox').load(link, function()
     {

module/testtask/view/create.html.php

@@ -14,6 +14,7 @@
 <?php include '../../common/view/datepicker.html.php';?>
 <?php include '../../common/view/kindeditor.html.php';?>
 <?php js::import($jsRoot . 'misc/date.js');?>
+<?php js::set('PRJID', $this->session->PRJ);?>
 <div id='mainContent' class='main-content'>
   <div class='center-block'>
     <div class='main-header'>