* Finish task #89149, and fix bug of merge code.

This commit is contained in:
liumengyi
2023-03-29 08:55:25 +08:00
parent bb3c743d75
commit be75bd716f
8 changed files with 47 additions and 20 deletions
+2 -2
View File
@@ -2,10 +2,10 @@
$config->api = new stdClass();
$config->api->createlib = new stdclass();
$config->api->createlib->requiredFields = 'name,baseUrl';
$config->api->createlib->requiredFields = 'name';
$config->api->editlib = new stdclass();
$config->api->editlib->requiredFields = 'name,baseUrl';
$config->api->editlib->requiredFields = 'name';
$config->api->struct = new stdClass();
$config->api->struct->requiredFields = 'name,params';
+1 -1
View File
@@ -347,7 +347,7 @@ class api extends control
return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => $this->createLink('api', 'index', "libID=$libID")));
}
$this->lang->api->aclList['default'] = sprintf($this->lang->doclib->aclList['default'], $this->lang->{$type}->common);
$this->lang->api->aclList['default'] = sprintf($this->lang->api->aclList['default'], $this->lang->{$type}->common);
$this->view->type = $type;
$this->view->groups = $this->loadModel('group')->getPairs();