Merge branch dev/bug-63436 of zentao/zentaopms (#9806)
This commit is contained in:
@@ -90,6 +90,7 @@ $config->doc->form->edit['editedDate'] = array('type' => 'datetime', 'required'
|
||||
|
||||
$config->doc->form->edittemplate = $config->doc->form->edit;
|
||||
$config->doc->form->edittemplate['templateDesc'] = array('type' => 'string', 'required' => false, 'default' => '');
|
||||
$config->doc->form->edittemplate['module'] = array('type' => 'int', 'required' => true, 'default' => 0);
|
||||
|
||||
$config->doc->form->movelib['space'] = array('type' => 'string', 'required' => true, 'default' => '');
|
||||
$config->doc->form->movelib['acl'] = array('type' => 'string', 'required' => true, 'default' => '');
|
||||
|
||||
@@ -716,6 +716,7 @@ class doc extends control
|
||||
$doc = $this->doc->getByID($docID);
|
||||
if(!empty($_POST))
|
||||
{
|
||||
$this->lang->doc->module = $this->lang->docTemplate->module;
|
||||
$changes = $files = array();
|
||||
$docData = form::data()
|
||||
->setDefault('editedBy', $this->app->user->account)
|
||||
|
||||
Reference in New Issue
Block a user