mirror of https://github.com/MISP/MISP
fix: [UI] Add Object works again for all databases
parent
66586a8766
commit
be11c542e8
|
@ -21,7 +21,7 @@ class ObjectTemplatesController extends AppController
|
|||
|
||||
public function objectMetaChoice($event_id)
|
||||
{
|
||||
$metas = $this->ObjectTemplate->find('list', array(
|
||||
$metas = $this->ObjectTemplate->find('all', array(
|
||||
'recursive' => -1,
|
||||
'conditions' => array('ObjectTemplate.active' => 1),
|
||||
'fields' => array('meta-category'),
|
||||
|
@ -35,6 +35,7 @@ class ObjectTemplatesController extends AppController
|
|||
'value' => $this->baseurl . "/ObjectTemplates/objectChoice/$eventId/0"
|
||||
]];
|
||||
foreach ($metas as $meta) {
|
||||
$meta = $meta['ObjectTemplate']['meta-category'];
|
||||
$items[] = array(
|
||||
'name' => $meta,
|
||||
'value' => $this->baseurl . "/ObjectTemplates/objectChoice/$eventId/" . h($meta)
|
||||
|
|
|
@ -231,7 +231,7 @@ function submitFunction(clicked, callback) {
|
|||
<select id="<?php echo $select_id; ?>" autofocus style="height: 100px; margin-bottom: 0px;" <?php echo h($this->GenericPicker->add_select_params($defaults)); ?>>
|
||||
<option></option>
|
||||
<?php
|
||||
foreach ($items as $k => $param) {
|
||||
foreach ($items as $param) {
|
||||
if (isset($param['isPill']) && $param['isPill']) {
|
||||
$flag_addPills = true;
|
||||
continue;
|
||||
|
@ -256,7 +256,7 @@ function submitFunction(clicked, callback) {
|
|||
<?php if ($flag_addPills): // add forced pills ?>
|
||||
<ul class="nav nav-pills">
|
||||
<?php
|
||||
foreach ($items as $k => $param) {
|
||||
foreach ($items as $param) {
|
||||
if (isset($param['isPill']) && $param['isPill']) {
|
||||
echo $this->GenericPicker->add_pill($param, $defaults);
|
||||
if (isset($param['additionalData'])) {
|
||||
|
@ -280,7 +280,7 @@ function submitFunction(clicked, callback) {
|
|||
<ul class="nav nav-pills">
|
||||
<select id="<?php echo $select_id; ?>" autofocus style="display: none;" <?php echo h($this->GenericPicker->add_select_params($defaults)); ?>></select>
|
||||
<?php
|
||||
foreach ($items as $k => $param) {
|
||||
foreach ($items as $param) {
|
||||
echo $this->GenericPicker->add_pill($param, $defaults);
|
||||
if (isset($param['additionalData'])) {
|
||||
$additionalData = $param['additionalData'];
|
||||
|
|
Loading…
Reference in New Issue