chg: [instance] Added support of API response for 2 endpoints
parent
46870a4bcc
commit
49a3dd1623
|
@ -70,6 +70,12 @@ class InstanceController extends AppController
|
||||||
usort($status, function($a, $b) {
|
usort($status, function($a, $b) {
|
||||||
return strcmp($b['id'], $a['id']);
|
return strcmp($b['id'], $a['id']);
|
||||||
});
|
});
|
||||||
|
if ($this->ParamHandler->isRest()) {
|
||||||
|
return $this->RestResponse->viewData([
|
||||||
|
'status' => $status,
|
||||||
|
'updateAvailables' => $migrationStatus['updateAvailables'],
|
||||||
|
], 'json');
|
||||||
|
}
|
||||||
$this->set('status', $status);
|
$this->set('status', $status);
|
||||||
$this->set('updateAvailables', $migrationStatus['updateAvailables']);
|
$this->set('updateAvailables', $migrationStatus['updateAvailables']);
|
||||||
}
|
}
|
||||||
|
@ -140,6 +146,14 @@ class InstanceController extends AppController
|
||||||
{
|
{
|
||||||
$this->Settings = $this->getTableLocator()->get('Settings');
|
$this->Settings = $this->getTableLocator()->get('Settings');
|
||||||
$all = $this->Settings->getSettings(true);
|
$all = $this->Settings->getSettings(true);
|
||||||
|
if ($this->ParamHandler->isRest()) {
|
||||||
|
return $this->RestResponse->viewData([
|
||||||
|
'settingsProvider' => $all['settingsProvider'],
|
||||||
|
'settings' => $all['settings'],
|
||||||
|
'settingsFlattened' => $all['settingsFlattened'],
|
||||||
|
'notices' => $all['notices'],
|
||||||
|
], 'json');
|
||||||
|
}
|
||||||
$this->set('settingsProvider', $all['settingsProvider']);
|
$this->set('settingsProvider', $all['settingsProvider']);
|
||||||
$this->set('settings', $all['settings']);
|
$this->set('settings', $all['settings']);
|
||||||
$this->set('settingsFlattened', $all['settingsFlattened']);
|
$this->set('settingsFlattened', $all['settingsFlattened']);
|
||||||
|
|
Loading…
Reference in New Issue