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 zentaopms_304

Browse Source
This commit is contained in:
liumengyi
2023-04-17 11:07:37 +08:00
parent 5f4610a151 af61f4248d
commit 1209834769
4 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
db/update18.3.sql
+2
View File
@@ -564,6 +564,8 @@ CHANGE `activatedDate` `activatedDate` datetime NULL;
ALTER TABLE `zt_kanbancard`
CHANGE `begin` `begin` date NULL,
CHANGE `end` `end` date NULL,
CHANGE `fromID` `fromID` mediumint unsigned NOT NULL DEFAULT '0',
CHANGE `fromType` `fromType` varchar(30) NOT NULL DEFAULT '',
CHANGE `whitelist` `whitelist` text NULL,
CHANGE `lastEditedBy` `lastEditedBy` char(30) NOT NULL DEFAULT '',
CHANGE `lastEditedDate` `lastEditedDate` datetime NULL,
db/zentao.sql
+2 -2
View File
@@ -1017,8 +1017,8 @@ CREATE TABLE IF NOT EXISTS `zt_kanbancard` (
`kanban` mediumint(8) unsigned NOT NULL,
`region` mediumint(8) unsigned NOT NULL,
`group` mediumint(8) unsigned NOT NULL,
`fromID` mediumint(8) unsigned NOT NULL,
`fromType` varchar(30) NOT NULL,
`fromID` mediumint(8) unsigned NOT NULL DEFAULT '0',
`fromType` varchar(30) NOT NULL DEFAULT '',
`name` varchar(255) NOT NULL,
`status` varchar(30) NOT NULL DEFAULT 'doing',
`pri` mediumint(8) unsigned NOT NULL,
lib/dao/dm.class.php
+2
View File
@@ -70,8 +70,10 @@ class dm extends dao
*/
public function descTable($tableName)
{
$this->dbh->setAttribute(PDO::ATTR_CASE, PDO::CASE_LOWER);
$sql = "select * from all_tab_columns where table_name = '$tableName'";
$rawFields = $this->dbh->rawQuery($sql)->fetchAll();
$this->dbh->setAttribute(PDO::ATTR_CASE, PDO::CASE_NATURAL);
$fields = array();
foreach($rawFields as $rawField)
module/execution/model.php
+1 -1
View File
@@ -2783,7 +2783,7 @@ class executionModel extends model
*/
public function getToImport($executionIds, $type, $model = '')
{
return $this->dao->select('t1.id,concat_ws(" / ", t2.name, t1.name) as name')->from(TABLE_EXECUTION)->alias('t1')
return $this->dao->select("t1.id,concat_ws(' / ', t2.name, t1.name) as name")->from(TABLE_EXECUTION)->alias('t1')
->leftJoin(TABLE_PROJECT)->alias('t2')->on('t2.id=t1.project')
->where('t1.id')->in($executionIds)
->beginIF(!$this->app->user->admin)->andWhere('t1.id')->in($this->app->user->view->sprints)->fi()