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

Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaoipd

Browse Source
This commit is contained in:
tanghucheng
2023-04-20 11:05:43 +08:00
parent 8bf4bbccf0 ba630dcbff
commit f83301bb91
3 changed files with 25 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
db/update18.3.sql
+13 -5
View File
@@ -1035,17 +1035,25 @@ ALTER TABLE `zt_testreport`
CHANGE `project` `project` mediumint unsigned NOT NULL DEFAULT '0',
CHANGE `product` `product` mediumint unsigned NOT NULL DEFAULT '0',
CHANGE `execution` `execution` mediumint unsigned NOT NULL DEFAULT '0',
CHANGE `stories` `stories` text COLLATE 'utf8mb3_general_ci' NULL,
CHANGE `bugs` `bugs` text COLLATE 'utf8mb3_general_ci' NULL,
CHANGE `cases` `cases` text COLLATE 'utf8mb3_general_ci' NULL,
CHANGE `report` `report` text COLLATE 'utf8mb3_general_ci' NULL,
CHANGE `deleted` `deleted` enum('0','1') COLLATE 'utf8mb3_general_ci' NOT NULL DEFAULT '0';
CHANGE `stories` `stories` text NULL,
CHANGE `bugs` `bugs` text NULL,
CHANGE `cases` `cases` text NULL,
CHANGE `report` `report` text NULL,
CHANGE `deleted` `deleted` enum('0','1') NOT NULL DEFAULT '0';
ALTER TABLE `zt_testrun`
CHANGE `lastRunner` `lastRunner` varchar(30) NOT NULL DEFAULT '',
CHANGE `lastRunDate` `lastRunDate` datetime NULL,
CHANGE `lastRunResult` `lastRunResult` char(30) NOT NULL DEFAULT '';
ALTER TABLE `zt_testresult`
CHANGE `job` `job` mediumint unsigned NOT NULL DEFAULT '0',
CHANGE `compile` `compile` mediumint unsigned NOT NULL DEFAULT '0',
CHANGE `ZTFResult` `ZTFResult` text NULL,
CHANGE `duration` `duration` float NOT NULL DEFAULT '0',
CHANGE `xml` `xml` text NULL,
CHANGE `deploy` `deploy` mediumint unsigned NOT NULL DEFAULT '0';
ALTER TABLE `zt_testsuite`
CHANGE `project` `project` mediumint unsigned NOT NULL DEFAULT '0',
CHANGE `product` `product` mediumint unsigned NOT NULL DEFAULT '0',
db/zentao.sql
+10 -11
View File
File diff suppressed because one or more lines are too long
module/file/model.php
+2 -2
View File
@@ -123,14 +123,14 @@ class fileModel extends model
* Save upload.
*
* @param string $objectType
* @param string $objectID
* @param int $objectID
* @param string $extra
* @param string $filesName
* @param string $labelsName
* @access public
* @return array
*/
public function saveUpload($objectType = '', $objectID = '', $extra = '', $filesName = 'files', $labelsName = 'labels')
public function saveUpload($objectType = '', $objectID = 0, $extra = '', $filesName = 'files', $labelsName = 'labels')
{
$fileTitles = array();
$now = helper::today();