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

Merge branch 'release/21.7.1' into feature/doctemplate

Browse Source
This commit is contained in:
xieqiyu
2025-05-19 17:10:17 +08:00
parent 21689da42a d68d4aa82a
commit 0fd2ee4e6a
238 changed files with 11017 additions and 1167 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/upgrade/model.php
+2 -1
View File
@@ -10667,6 +10667,7 @@ class upgradeModel extends model
->andWhere('t2.rawContent')->in(null)
->andWhere('t1.templateType')->eq('')
->andWhere('t1.template')->eq('')
->andWhere('t2.fromVersion')->eq(0)
->fetchAll('id', false);
$newDocs = array();
@@ -10717,7 +10718,7 @@ class upgradeModel extends model
$this->dao->insert(TABLE_DOCCONTENT)->data($newDocContent)->exec();
$this->dao->update(TABLE_DOC)->set('version')->eq($newDocContent->version)->where('id')->eq($docID)->exec();
$this->loadModel('action')->create('doc', $docID, 'convertDoc', sprintf($this->lang->doc->docConvertComment, "#$docContent->version", '', 'system'));
$this->loadModel('action')->create('doc', $docID, 'convertDoc', sprintf($this->lang->doc->docConvertComment, "#$docContent->version", ''), '', 'system');
}
elseif($docContent->type == 'doc')
{