tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-27 07:44:35 +02:00
Code Issues Packages Projects Releases Wiki Activity

fixed direct html responses with sl2

Browse Source
This commit is contained in:
fbsanchez 2020-09-28 16:02:54 +02:00
parent 29ac13815a
commit 12314d33c3
2 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
pandora_console/include/functions_html.php
View File

@ -462,9 +462,20 @@ function html_print_select_groups(
$size=false, $size=false,
$simple_multiple_options=false $simple_multiple_options=false
) { ) {
global $config; $output = '';
ui_require_css_file('select2.min');
ui_require_javascript_file('select2.min'); if (is_ajax()) {
$output .= '<script src="';
$output .= ui_get_full_url('include/javascript/select2.min.js');
$output .= '" type="text/javascript"></script>';
$output .= '<link rel="stylesheet" href="';
$output .= ui_get_full_url('include/styles/select2.min.css');
$output .= '"/>';
} else {
ui_require_css_file('select2.min');
ui_require_javascript_file('select2.min');
}
if ($name === null) { if ($name === null) {
static $idcounter = []; static $idcounter = [];
@ -499,7 +510,7 @@ function html_print_select_groups(
$json_inclusions = json_encode($include_groups); $json_inclusions = json_encode($include_groups);
} }
$output = html_print_select( $output .= html_print_select(
$fields, $fields,
$name, $name,
$selected, $selected,

8
pandora_console/include/lib/View.php
View File

@ -53,8 +53,6 @@ class View
{ {
global $config; global $config;
ob_start('ui_process_page_head');
if (is_array($data) === true) { if (is_array($data) === true) {
extract($data); extract($data);
} }
@ -69,12 +67,6 @@ class View
} else { } else {
ui_print_error_message(__('View %s not found', $page), true); ui_print_error_message(__('View %s not found', $page), true);
} }
while (@ob_end_flush()) {
// Dumping...
continue;
}
} }