* Fixed the error message for edit the document module.
This commit is contained in:
@@ -408,13 +408,8 @@ class tree extends control
|
||||
|
||||
$this->tree->update($moduleID, $type);
|
||||
|
||||
$response = array();
|
||||
$response['result'] = 'success';
|
||||
$response['message'] = $this->lang->saveSuccess;
|
||||
$response['closeModal'] = true;
|
||||
$response['load'] = true;
|
||||
|
||||
$this->send($response);
|
||||
if(dao::isError()) return $this->send(array('result' => 'fail', 'message' => dao::getError()));
|
||||
return $this->sendSuccess(array('clodeModal' => true, 'load' => true));
|
||||
}
|
||||
|
||||
$module = $this->tree->getById($moduleID);
|
||||
|
||||
+10
-2
@@ -1911,8 +1911,16 @@ class treeModel extends model
|
||||
if((empty($module->root) or empty($module->name)) and in_array($self->type, array('doc', 'api')))
|
||||
{
|
||||
$this->app->loadLang('doc');
|
||||
if(empty($module->root)) helper::end(js::alert(sprintf($this->lang->error->notempty, $this->lang->doc->lib)));
|
||||
if(empty($module->name)) helper::end(js::alert(sprintf($this->lang->error->notempty, $this->lang->doc->catalogName)));
|
||||
if(empty($module->root))
|
||||
{
|
||||
dao::$errors['root'] = sprintf($this->lang->error->notempty, $this->lang->doc->lib);
|
||||
return false;
|
||||
}
|
||||
if(empty($module->name))
|
||||
{
|
||||
dao::$errors['name'] = sprintf($this->lang->error->notempty, $this->lang->doc->catalogName);
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
$modules = $self->type == 'story' ? $this->getOptionMenu($self->root, 'story', 0, 'all') : array();
|
||||
|
||||
@@ -53,12 +53,14 @@ formPanel
|
||||
) : null,
|
||||
$type == 'doc' ? formGroup
|
||||
(
|
||||
set::name('root'),
|
||||
set::label($lang->doc->lib),
|
||||
set::control('picker'),
|
||||
set::name('root'),
|
||||
set::value($module->root),
|
||||
set::items($libs)
|
||||
picker
|
||||
(
|
||||
set::name('root'),
|
||||
set::value($module->root),
|
||||
set::items($libs),
|
||||
set::required(true)
|
||||
)
|
||||
) : null,
|
||||
formGroup
|
||||
(
|
||||
@@ -71,12 +73,12 @@ formPanel
|
||||
(
|
||||
set::className($hidden ? 'moduleBox hidden' : 'moduleBox'),
|
||||
set::label(($type == 'doc' or $type == 'api') ? $lang->tree->parentCate : $lang->tree->parent),
|
||||
control
|
||||
picker
|
||||
(
|
||||
set::type('picker'),
|
||||
set::name('parent'),
|
||||
set::value($module->parent),
|
||||
set::items($optionMenu)
|
||||
set::items($optionMenu),
|
||||
set::required(true)
|
||||
)
|
||||
) : null,
|
||||
$type == 'bug' ? formGroup
|
||||
|
||||
Reference in New Issue
Block a user