From 49909d01c1c6833ee742d534f4103f35440fdab9 Mon Sep 17 00:00:00 2001
From: wangyidong <yidong@cnezsoft.com>
Date: Mon, 6 Nov 2017 17:46:57 +0800
Subject: [PATCH]  * adjust for required.

---
 module/custom/config.php | 4 ++--
 module/doc/model.php     | 6 ++----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/module/custom/config.php b/module/custom/config.php
index 927a1e8883..52f94670e7 100644
--- a/module/custom/config.php
+++ b/module/custom/config.php
@@ -53,5 +53,5 @@ $config->custom->fieldList['testcase']['createcase'] = 'lib,type,stage,title,pri
 $config->custom->fieldList['testreport']             = 'begin,end,owner,members,title,report';
 $config->custom->fieldList['testtask']               = 'project,build,,owner,pri,begin,end,status,name,desc';
 $config->custom->fieldList['doc']                    = 'title,keywords,content';
-$config->custom->fieldList['user']['create']         = 'dept,account,realname,password,password1,password2,role,email,commiter,join';
-$config->custom->fieldList['user']['edit']           = 'dept,account,realname,role,email,commiter,join,skype,qq,mobile,phone,address,zipcode,wangwang,gtalk';
+$config->custom->fieldList['user']['create']         = 'dept,account,realname,password,password1,password2,role,email,commiter';
+$config->custom->fieldList['user']['edit']           = 'dept,account,realname,role,email,commiter,skype,qq,mobile,phone,address,zipcode,wangwang,gtalk';
diff --git a/module/doc/model.php b/module/doc/model.php
index 39f85ff69c..4205942df7 100644
--- a/module/doc/model.php
+++ b/module/doc/model.php
@@ -414,12 +414,11 @@ class docModel extends model
         $docContent->type    = $doc->contentType;
         $docContent->version = 1;
         if($doc->contentType == 'markdown') $docContent->content = str_replace('&gt;', '>', $docContent->content);
-        unset($doc->content);
         unset($doc->contentMarkdown);
         unset($doc->contentType);
         unset($doc->url);
 
-        $this->dao->insert(TABLE_DOC)->data($doc)->autoCheck()
+        $this->dao->insert(TABLE_DOC)->data($doc, 'content')->autoCheck()
             ->batchCheck($this->config->doc->create->requiredFields, 'notempty')
             ->exec();
         if(!dao::isError())
@@ -501,10 +500,9 @@ class docModel extends model
             $docContent->files   = trim($docContent->files, ',');
             $this->dao->insert(TABLE_DOCCONTENT)->data($docContent)->exec();
         }
-        unset($doc->content);
         unset($doc->contentType);
 
-        $this->dao->update(TABLE_DOC)->data($doc)
+        $this->dao->update(TABLE_DOC)->data($doc, 'content')
             ->autoCheck()
             ->batchCheck($this->config->doc->edit->requiredFields, 'notempty')
             ->where('id')->eq((int)$docID)