mirror of https://github.com/MISP/MISP
fix: allow setting org_id=0 via cake console, add --force option to force settings.
parent
7275ac97ad
commit
da0f9c4148
|
@ -346,7 +346,7 @@ class AdminShell extends AppShell
|
||||||
echo 'Invalid setting "' . $setting_name . '". Please make sure that the setting that you are attempting to change exists and if a module parameter, the modules are running.' . PHP_EOL;
|
echo 'Invalid setting "' . $setting_name . '". Please make sure that the setting that you are attempting to change exists and if a module parameter, the modules are running.' . PHP_EOL;
|
||||||
exit(1);
|
exit(1);
|
||||||
}
|
}
|
||||||
$result = $this->Server->serverSettingsEditValue($cli_user, $setting, $value);
|
$result = $this->Server->serverSettingsEditValue($cli_user, $setting, $value, $this->params['force']);
|
||||||
if ($result === true) {
|
if ($result === true) {
|
||||||
echo 'Setting "' . $setting_name . '" changed to ' . $value . PHP_EOL;
|
echo 'Setting "' . $setting_name . '" changed to ' . $value . PHP_EOL;
|
||||||
} else {
|
} else {
|
||||||
|
@ -490,6 +490,7 @@ class AdminShell extends AppShell
|
||||||
{
|
{
|
||||||
$this->ConfigLoad->execute();
|
$this->ConfigLoad->execute();
|
||||||
$parser = parent::getOptionParser();
|
$parser = parent::getOptionParser();
|
||||||
|
|
||||||
$parser->addSubcommand('updateJSON', array(
|
$parser->addSubcommand('updateJSON', array(
|
||||||
'help' => __('Update the JSON definitions of MISP.'),
|
'help' => __('Update the JSON definitions of MISP.'),
|
||||||
'parser' => array(
|
'parser' => array(
|
||||||
|
@ -498,6 +499,14 @@ class AdminShell extends AppShell
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
));
|
));
|
||||||
|
|
||||||
|
$parser->addOption('force', array(
|
||||||
|
'short' => 'f',
|
||||||
|
'help' => 'Force the command.',
|
||||||
|
'default' => false,
|
||||||
|
'boolean' => true
|
||||||
|
));
|
||||||
|
|
||||||
return $parser;
|
return $parser;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1516,10 +1516,10 @@ class Server extends AppModel
|
||||||
|
|
||||||
public function testLocalOrg($value)
|
public function testLocalOrg($value)
|
||||||
{
|
{
|
||||||
$this->Organisation = ClassRegistry::init('Organisation');
|
|
||||||
if ($value == 0) {
|
if ($value == 0) {
|
||||||
return 'No organisation selected';
|
return true; // `No organisation selected` option
|
||||||
}
|
}
|
||||||
|
$this->Organisation = ClassRegistry::init('Organisation');
|
||||||
$local_orgs = $this->Organisation->find('list', array(
|
$local_orgs = $this->Organisation->find('list', array(
|
||||||
'conditions' => array('local' => 1),
|
'conditions' => array('local' => 1),
|
||||||
'recursive' => -1,
|
'recursive' => -1,
|
||||||
|
|
Loading…
Reference in New Issue