MISP
/
MISP
mirror of https://github.com/MISP/MISP
2
2
Fork 0
Code Issues Releases Wiki Activity

fix: removed duplicate of the same condition

pull/1317/head
Iglocska 2016-06-30 11:46:27 +02:00
parent 2a7115bb91
commit a97d90ca5a
1 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
app/Controller/AttributesController.php
View File

@ -160,24 +160,22 @@ class AttributesController extends AppController {
return new CakeResponse(array('body'=> json_encode(array('saved' => true, 'success' => $successCount . ' Attributes added')), 'status' => 200));
}
} else if ($this->_isRest()) {
if ($this->_isRest()) { // TODO return error if REST
$name = 'Attribute(s) could not be added.';
$message = 'Could not save any of the POSTed attributes. Check errors field to see what caused the failures.';
if ($successCount) {
$name = 'Attribute(s) added.';
$message = $successCount . ' attribute(s) successfuly added.';
if ($failCount) {
$name = 'Only a subset of the attributes could be added.';
$message = $successCount . ' attribute(s) added, but ' . $failCount . ' of them failed the validation. Check the errors field for more details.';
}
$name = 'Attribute(s) could not be added.';
$message = 'Could not save any of the POSTed attributes. Check errors field to see what caused the failures.';
if ($successCount) {
$name = 'Attribute(s) added.';
$message = $successCount . ' attribute(s) successfuly added.';
if ($failCount) {
$name = 'Only a subset of the attributes could be added.';
$message = $successCount . ' attribute(s) added, but ' . $failCount . ' of them failed the validation. Check the errors field for more details.';
}
$this->set('name', $name);
$this->set('message', $message);
$this->set('errors', $validationErrors);
$this->set('url', '/attributes/add/' . $eventId);
$this->set('_serialize', array('name', 'message', 'url', 'errors'));
return false;
}
$this->set('name', $name);
$this->set('message', $message);
$this->set('errors', $validationErrors);
$this->set('url', '/attributes/add/' . $eventId);
$this->set('_serialize', array('name', 'message', 'url', 'errors'));
return false;
} else {
// we added all the attributes
if ($fails) {