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

chg: [UI] WIP - generic_picker automatically switch to submit pills if 

applicable
pull/4024/head
mokaddem 2019-01-11 14:01:44 +01:00
parent 5b0e777dca
commit 59da2396ad
3 changed files with 35 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/Controller/GalaxiesController.php
View File

@ -242,7 +242,7 @@ class GalaxiesController extends AppController
$this->set('items', $items);
$this->set('options', array( // set chosen (select picker) options
'functionName' => $onClickForm,
'multiple' => -1,
'multiple' => '-1',
));
$this->render('ajax/cluster_choice');
}
@ -265,6 +265,9 @@ class GalaxiesController extends AppController
return new CakeResponse(array('body'=> json_encode(array('saved' => false, 'error' => __('No clusters picked.'))), 'status'=>200, 'type' => 'json'));
}
$result = "";
if (!is_array($cluster_ids)) { // in case we only want to attach 1
$cluster_ids = array($cluster_ids);
}
foreach ($cluster_ids as $cluster_id) {
$result = $this->Galaxy->attachCluster($this->Auth->user(), $target_type, $target_id, $cluster_id);
}

33
app/View/Elements/generic_picker.ctp
View File

@ -41,6 +41,9 @@
foreach ($options['select_options'] as $option => $value) {
$select_html .= $option . '=' . $value . ' ';
}
if (isset($options['functionName']) && $options['functionName'] !== "") {
$select_html .= ' data-functionname=' . $options['functionName'] .' ';
}
return $select_html;
}
@ -90,15 +93,22 @@
// $param_html .= 'onclick="' . $param['functionName'] . '" ';
$param_html .= 'onclick="execAndClose(this, ' . $param['functionName'] . ')" ';
} else { // fallback to default submit function
$param_html .= 'onclick="submitFunction(this, ' . $defaults['functionName'] . ')" ';
if ($defaults['functionName'] !== '') {
$param_html .= 'onclick="submitFunction(this, ' . $defaults['functionName'] . ')" ';
} else {
$param_html .= 'data-endpoint="' . h($param['value']) . '" ';
$param_html .= 'onclick="fetchRequestedData(this)" ';
}
}
$additionalData = json_encode(array());
foreach ($param as $paramName => $paramValue) {
if ($paramName === 'additionalData') {
$additionalData = json_encode($param['additionalData']);
} else if ($paramName === 'value'){
} else if ($paramName === 'value') {
$param_html .= 'value="' . h($paramValue) . '" ';
} else if ($paramName === 'template' || $paramName === 'templateData') {
continue;
} else {
$param_html .= 'data-' . h($paramName). '="' . h($paramValue) . '" ';
}
@ -118,8 +128,9 @@
$pill_html .= '>';
if (isset($param['img'])) {
$pill_html .= '<img src="' . $param['img'] . '" style="margin-right: 5px; height: 14px;">';
} else if (isset($param['icon'])) {
$pill_html .= '<span class="fa ' . $param['icon'] . '" style="margin-right: 5px;"></span>';
} else if (isset($param['icon']) || isset($param['templateData']['icon'])) {
$icon = isset($param['icon']) ? $param['icon'] : $param['templateData']['icon'];
$pill_html .= '<span class="fa fa-' . $icon . '" style="margin-right: 5px;"></span>';
}
$pill_html .= h($name) . '</a>';
$pill_html .= '</li>';
@ -138,10 +149,16 @@ function setupChosen(id) {
$elem.chosen(chosen_options);
if (!$elem.prop('multiple')) { // not multiple, selection trigger next event
$elem.change(function(event, selected) {
select = this;
$select = $(select);
$select.data('endpoint', selected.selected);
fetchRequestedData($select);
var fn = $elem.data('functionname');
if (fn !== undefined) {
fn = window[fn];
submitFunction(this, fn);
} else {
select = this;
$select = $(select);
$select.data('endpoint', selected.selected);
fetchRequestedData($select);
}
});
}

8
app/webroot/css/main.css
View File

@ -895,9 +895,13 @@ a.proposal_link_red:hover {
}
a.pill-pre-picker {
background-color: #fcfcfc;
background-color: #fcfcfc;
font-weight: bold;
border: solid 1px #00000033;
border: 1px #65737ec8 solid;
}
.nav-pills > .active > a.pill-pre-picker {
background-color: #65737e32;
color: #000;
}
.generic_picker {