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

api/v1/entries/testresults.php

@@ -70,10 +70,12 @@ class testresultsEntry extends entry
         {
             $results = array();
             $reals   = array();
+            $count   = 0;
             foreach($this->requestBody->steps as $index => $step)
             {
                 /* When post data more than case steps, break after take useful data. */
-                if($index + 1 > count($steps)) break;
+                $count ++;
+                if($count > count($steps)) break;
 
                 $stepID           = $steps[$index];
                 $results[$stepID] = $step->result;

db/zentao.sql

@@ -352,7 +352,7 @@ CREATE TABLE IF NOT EXISTS `zt_burn` (
   `execution` mediumint(8) unsigned NOT NULL DEFAULT '0',
   `product` mediumint(8) unsigned NOT NULL DEFAULT '0',
   `task` mediumint(8) unsigned NOT NULL DEFAULT '0',
-  `date` date NULL,
+  `date` date NOT NULL default '0000-00-00',
   `estimate` float NOT NULL,
   `left` float NOT NULL,
   `consumed` float NOT NULL,

module/project/doc/project.txt

@@ -0,0 +1,117 @@
+createGuide ## 1 zk
+export
+ajaxGetDropMenu
+ajaxGetCopyProjects
+ajaxGetUnlinkTips
+ajaxGetLinkedProducts
+ajaxGetObjectInfo
+index
+browse
+kanban
+programTitle
+create
+edit
+batchEdit
+view
+group
+createGroup
+dynamic
+execution
+bug
+testcase
+testreport
+testtask
+build
+managePriv
+team
+unlinkMember
+manageMembers
+manageGroupMember
+copyGroup
+editGroup ## 2 sgm
+start
+suspend
+close
+activate
+delete
+updateOrder
+whitelist
+addWhitelist
+unbindWhitelist
+manageProducts
+ajaxGetExecutions
+ajaxGetPairsByExecution
+checkPriv
+accessDenied
+buildSearchFrom
+processProjectPrivs
+createManageLink
+buildMenuQuery
+getProgramTree
+getTreeMenu
+buildProjectBuildSearchForm
+changeExecutionStatus
+updateShadowProduct
+updateProductProgram
+checkCanChangeModel
+updateRepoRelations
+linkedRepoPairs
+getMultiLinkedProducts
+getBudgetUnitList
+getSwitcher ## 3 ly
+getByID
+getByShadowProduct
+getInfoList
+getParentProgram
+getOverviewList
+getTotalStoriesByProject
+getTotalBugByProject
+getTotalTaskByProject
+getWaterfallProgress
+getWaterfallPVEVAC
+getWorkhour
+getProjectsConsumed
+getProjectLink
+getStatData
+getPairs
+getPairsByProgram
+getBrotherProjects
+getByIdList
+getPairsByIdList
+getBranchesByProject
+getBranchGroupByProject
+getNoProductList
+getProjectExecutionPairs
+getPairsByModel
+getStoriesByProject
+getTeamMembers
+getTeamMemberPairs
+getTeamMemberGroup
+getMembers2Import
+getStats4Kanban ## 4 dk
+getBudgetWithUnit
+getDataByProject
+create
+update
+batchUpdate
+start
+putoff
+suspend
+activate
+close
+isClickable
+setMenu
+saveState
+unlinkMember
+manageMembers
+updateProducts
+updateInvolvedUserView
+computerProgress
+setNoMultipleMenu
+buildOperateMenuZin
+buildOperateMenu
+buildOperateViewMenu
+buildOperateBrowseMenuZin
+buildOperateBrowseMenu
+printCell
+printCellZin

zin/zentao/zentao.func.php

@@ -35,7 +35,7 @@ function createLink($moduleName, $methodName = 'index', $vars = array(), $viewTy
 
 function inLink($methodName = 'index', $vars = '', $viewType = '', $onlybody = false)
 {
-    return inlink($methodName, $vars, $viewType, $onlybody);
+    return \inlink($methodName, $vars, $viewType, $onlybody);
 }
 
 function zget($var, $key, $valueWhenNone = false, $valueWhenExists = false)
@@ -50,7 +50,7 @@ function getWebRoot($full = false)
 
 function hasPriv($module, $method, $object = null, $vars = '')
 {
-    return common::hasPriv($module, $method, $object, $vars);
+    return \common::hasPriv($module, $method, $object, $vars);
 }
 
 function isFieldRequired($name)