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

* finish task #2678.

Browse Source
This commit is contained in:
wangyidong
2016-10-25 10:16:05 +08:00
parent 67e27080a6
commit 96ccd38fd6
84 changed files with 31852 additions and 4502 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/doc/model.php
+7 -3
View File
@@ -295,6 +295,7 @@ class docModel extends model
->add('version', 1)
->setDefault('product,project,module', 0)
->stripTags($this->config->doc->editor->create['id'], $this->config->allowedTags)
->stripTags($this->config->doc->markdown->create['id'], $this->config->allowedTags)
->cleanInt('product,project,module')
->join('groups', ',')
->join('users', ',')
@@ -313,12 +314,15 @@ class docModel extends model
$docContent = new stdclass();
$docContent->title = $doc->title;
$docContent->digest = $doc->digest;
$docContent->content = $doc->content;
$docContent->digest = $doc->type == 'html' ? $doc->digest : $doc->digestMarkdown;
$docContent->content = $doc->type == 'html' ? $doc->content : $doc->contentMarkdown;
$docContent->type = $doc->type;
$docContent->version = 1;
$docContent->type = 'html';
unset($doc->digest);
unset($doc->digestMarkdown);
unset($doc->content);
unset($doc->contentMarkdown);
unset($doc->type);
$this->dao->insert(TABLE_DOC)->data($doc)->autoCheck()
->batchCheck($this->config->doc->create->requiredFields, 'notempty')