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

* finish task #8265.

Browse Source
This commit is contained in:
z
2020-11-12 09:25:13 +08:00
parent e330353df3
commit 154ace870a
3 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
db/update12.4.4.sql
+10
View File
@@ -1,3 +1,13 @@
ALTER TABLE `zt_doc` ADD `mailto` text AFTER `editedDate`;
ALTER TABLE `zt_task` CHANGE `realStarted` `realStarted` datetime NOT NULL AFTER `estStarted`;
ALTER TABLE `zt_group` CHANGE `program` `PRJ` mediumint(8) unsigned NOT NULL DEFAULT 0;
ALTER TABLE `zt_notify` ADD INDEX `objectType_toList_status` (`objectType`, `toList`, `status`);
ALTER TABLE `zt_user` ADD INDEX `deleted` (`deleted`);
ALTER TABLE `zt_case` ADD INDEX `fromBug` (`fromBug`);
ALTER TABLE `zt_bug` ADD INDEX `toStory` (`toStory`);
ALTER TABLE `zt_task` ADD INDEX `parent` (`parent`);
ALTER TABLE `zt_bug` ADD INDEX `result` (`result`);
ALTER TABLE `zt_history` ADD INDEX `action` (`action`);
ALTER TABLE `zt_action` ADD INDEX `action` (`action`);
ALTER TABLE `zt_action` DROP INDEX `product`;
module/action/model.php
+2 -2
View File
@@ -209,11 +209,11 @@ class actionModel extends model
$actions = $this->dao->select('*')->from(TABLE_ACTION)
->beginIF($objectType == 'project')
->where("objectType IN('project', 'testtask', 'build')")
->andWhere('project')->eq($objectID)
->andWhere('project')->eq((int)$objectID)
->fi()
->beginIF($objectType != 'project')
->where('objectType')->eq($objectType)
->andWhere('objectID')->eq($objectID)
->andWhere('objectID')->eq((int)$objectID)
->fi()
->orderBy('date, id')->fetchAll('id');
$histories = $this->getHistory(array_keys($actions));
module/story/model.php
+2 -2
View File
@@ -2050,8 +2050,8 @@ class storyModel extends model
->leftJoin(TABLE_PROJECTSTORY)->alias('t2')->on('t1.id=t2.story')
->where($sql)
->beginIF($productID != 'all' and $productID != '')->andWhere('t1.`product`')->eq((int)$productID)->fi()
->andWhere('deleted')->eq(0)
->andWhere('type')->eq($type)
->andWhere('t1.deleted')->eq(0)
->andWhere('t1.type')->eq($type)
->orderBy($orderBy)
->page($pager, 't1.id')
->fetchAll('id');