Skip to content
Snippets Groups Projects
Commit 5b23b580 authored by Daniel Berthereau's avatar Daniel Berthereau
Browse files

Fixed config form.

parent 50d5781f
Branches
No related tags found
No related merge requests found
...@@ -214,7 +214,7 @@ SQL; ...@@ -214,7 +214,7 @@ SQL;
$services = $this->getServiceLocator(); $services = $this->getServiceLocator();
$config = $services->get('Config'); $config = $services->get('Config');
$settings = $services->get('Omeka\Settings'); $settings = $services->get('Omeka\Settings');
$formElementManager = $services->get('FormElementManager'); $form = $services->get('FormElementManager')->get(ConfigForm::class);
$data = []; $data = [];
$defaultSettings = $config[strtolower(__NAMESPACE__)]['config']; $defaultSettings = $config[strtolower(__NAMESPACE__)]['config'];
...@@ -222,7 +222,6 @@ SQL; ...@@ -222,7 +222,6 @@ SQL;
$data[$name] = $settings->get($name); $data[$name] = $settings->get($name);
} }
$form = $formElementManager->get(ConfigForm::class);
$form->init(); $form->init();
$form->setData($data); $form->setData($data);
$html = $renderer->formCollection($form); $html = $renderer->formCollection($form);
...@@ -237,8 +236,7 @@ SQL; ...@@ -237,8 +236,7 @@ SQL;
$params = $controller->getRequest()->getPost(); $params = $controller->getRequest()->getPost();
$form = $this->getServiceLocator()->get('FormElementManager') $form = $services->get('FormElementManager')->get(ConfigForm::class);
->get(ConfigForm::class);
$form->init(); $form->init();
$form->setData($params); $form->setData($params);
if (!$form->isValid()) { if (!$form->isValid()) {
...@@ -250,7 +248,7 @@ SQL; ...@@ -250,7 +248,7 @@ SQL;
$defaultSettings = $config[strtolower(__NAMESPACE__)]['config']; $defaultSettings = $config[strtolower(__NAMESPACE__)]['config'];
foreach ($data as $name => $value) { foreach ($data as $name => $value) {
if (isset($defaultSettings[$name])) { if (array_key_exists($name, $defaultSettings)) {
if ($name === 'oaipmhrepository_namespace_id' && $value === 'localhost') { if ($name === 'oaipmhrepository_namespace_id' && $value === 'localhost') {
$value = 'default.must.change'; $value = 'default.must.change';
} }
......
...@@ -110,10 +110,11 @@ abstract class AbstractOaiSet extends AbstractXmlGenerator implements OaiSetInte ...@@ -110,10 +110,11 @@ abstract class AbstractOaiSet extends AbstractXmlGenerator implements OaiSetInte
case 'site_pool': case 'site_pool':
foreach ($oaiSets as $key => $oaiSet) { foreach ($oaiSets as $key => $oaiSet) {
$itemCount = $this->api $itemCount = $this->api
// TODO Check if this limit is useful.
->search('items', ['limit' => 0, 'site_id' => $oaiSet->id()]) ->search('items', ['limit' => 0, 'site_id' => $oaiSet->id()])
->getTotalResults(); ->getTotalResults();
if (empty($itemCount)) { if (empty($itemCount)) {
unset($oaiSets[$key]); unset($oaiSets[$key]);
} }
} }
break; break;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment