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

Merge branch 'tanghucheng_task' into 'master'

Browse Source 
* Code for port.

See merge request easycorp/zentaopms!4889
This commit is contained in:
王怡栋
2022-08-10 05:52:29 +00:00
parent 87889f1498 824b9219d9
commit 99fa671ce8
3 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
db/update17.4.sql
+1
View File
@@ -29,6 +29,7 @@ UPDATE `zt_workflowfield` SET `options`=(SELECT id FROM `zt_workflowdatasource`
UPDATE `zt_workflowfield` SET `options`=(SELECT id FROM `zt_workflowdatasource` WHERE `code`='feedbackclosedReason' ORDER BY `id` DESC LIMIT 1), `control`='select' WHERE `module`='feedback' AND `field`='closedReason';
UPDATE `zt_project` SET `closedDate`='' AND `closedBy`='' WHERE `status` != 'closed';
UPDATE `zt_grouppriv` SET `method`='exportTemplate' WHERE `method` = 'exportTemplet';
INSERT IGNORE INTO `zt_workflowaction` (`module`, `action`, `method`, `name`, `type`, `batchMode`, `extensionType`, `open`, `position`, `layout`, `show`, `buildin`, `role`, `createdBy`, `createdDate`) VALUES
('bug', 'batchactivate', 'batchoperate', '批量激活', 'batch', 'different', 'none', 'normal', 'browse', 'normal', 'direct', '1', 'buildin', '', '2022-08-09 15:52');
module/common/view/gantt.html.php
+1
View File
@@ -16,6 +16,7 @@ if($currentLang != 'en') js::import($jsRoot . 'dhtmlxgantt/lang/' . $currentLang
?>
<style>
.gantt_message_area{display:none;}
#ganttPris:hover{background:unset;color:unset;cursor: unset;}
</style>
<script>
gantt.plugins({
module/port/model.php
+5 -6
View File
@@ -600,28 +600,27 @@ class portModel extends model
{
foreach($values as $field => $value)
{
if(empty($value)) continue;
if(in_array($field, $dataSourceList))
{
if($fieldList[$field]['control'] == 'multiple')
{
$value = explode(',', $value);
$multiple = '';
foreach($value as $tmpValue) $multiple .= "\n" . zget($exportDatas[$field], $tmpValue);
$multipleLsit = explode(',', $value);
foreach($multipleLsit as $tmpValue) $multiple .= "\n" . zget($exportDatas[$field], $tmpValue);
$rows[$id]->$field = $multiple;
}
else
{
$rows[$id]->$field = zget($exportDatas[$field], $value);
$rows[$id]->$field = zget($exportDatas[$field], $value, '');
}
}
elseif(strpos($this->config->port->userFields, $field) !== false)
{
$rows[$id]->$field = zget($exportDatas['user'], $value);
$rows[$id]->$field = zget($exportDatas['user'], $value, '');
}
/* if value = 0 or value = 0000:00:00 set value = ''*/
if(!$value or helper::isZeroDate($value))
if(helper::isZeroDate($value))
{
$rows[$id]->$field = '';
}