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

* [bug #58835] fix edit code block lang not record aciton to history panel.

Browse Source
This commit is contained in:
sunhao
2025-01-09 16:52:41 +08:00
committed by 刘刚
parent b1b1371980
commit 5aaef8afc2
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/doc/model.php
+11 -5
View File
@@ -1698,10 +1698,16 @@ class docModel extends model
if(isset($doc->content) && empty($doc->content)) return dao::$errors['content'] = sprintf($this->lang->error->notempty, $this->lang->doc->content);
}
$files = $this->loadModel('file')->saveUpload('doc', $docID);
$changes = common::createChanges($oldDoc, $doc);
$changed = $files ? true : false;
if(!$changed && isset($doc->rawContent)) $changed = (isset($oldDoc->rawContent) ? $oldDoc->rawContent : null) != $doc->rawContent;
$files = $this->loadModel('file')->saveUpload('doc', $docID);
$changes = common::createChanges($oldDoc, $doc);
$oldRawContent = isset($oldDocContent->rawContent) ? $oldDocContent->rawContent : '';
$newRawContent = isset($doc->rawContent) ? $doc->rawContent : '';
$changed = $files ? true : false;
if($oldRawContent != $newRawContent)
{
$changed = true;
$changes[] = array('field' => 'rawContent', 'old' => $oldRawContent, 'new' => $newRawContent);
}
if(!$changed)
{
foreach($changes as $change)
@@ -1723,7 +1729,7 @@ class docModel extends model
$docContent->files = $oldDocContent->files;
$docContent->type = isset($doc->contentType) ? $doc->contentType : $oldDocContent->type;
if($files) $docContent->files .= ',' . join(',', array_keys($files));
$docContent->rawContent = isset($doc->rawContent) ? $doc->rawContent : '';
$docContent->rawContent = $newRawContent;
$docContent->files = trim($docContent->files, ',');
if(isset($doc->digest)) $docContent->digest = $doc->digest;