diff --git a/application/controllers/Items.php b/application/controllers/Items.php index 78e975771..a41c6f740 100644 --- a/application/controllers/Items.php +++ b/application/controllers/Items.php @@ -54,7 +54,8 @@ class Items extends Secure_area implements iData_controller 'is_deleted' => FALSE); // check if any filter is set in the multiselect dropdown - $filters = array_merge($filters, $this->input->get('filters')); + $filledup = array_fill_keys($this->input->get('filters'), true); + $filters = array_merge($filters, $filledup); $items = $this->Item->search($search, $filters, $offset, $limit); $total_rows = $this->Item->get_found_rows($search, $filters); diff --git a/application/views/items/manage.php b/application/views/items/manage.php index 0ec095042..84a012e90 100644 --- a/application/views/items/manage.php +++ b/application/views/items/manage.php @@ -38,7 +38,7 @@ $(document).ready(function() return $.extend(arguments[0], { start_date: start_date, end_date: end_date, - filters: $("#filters").val() || [] + filters: $("#filters").val() || [""] }); }); table_support.init_delete('lang->line($controller_name."_confirm_delete")?>'); @@ -94,19 +94,22 @@ function post_bulk_form_submit(response) - -
diff --git a/css/ospos.css b/css/ospos.css index 3a4d08f48..3ebf4495e 100644 --- a/css/ospos.css +++ b/css/ospos.css @@ -142,6 +142,11 @@ a.rollover img padding: 3px; } +#filters.btn-group +{ + vertical-align: none; +} + button.btn.dropdown-toggle.btn-sm { background-color: white;