mirror/opensourcepos
1
0
Fork 0
mirror of https://github.com/opensourcepos/opensourcepos.git synced 2026-04-15 20:37:50 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ci3' into bootstrapUI

Browse Source
This commit is contained in:
FrancescoUK
2016-02-27 09:44:41 +00:00
parent e5e3b89c6d 3cb9aaa055
commit d7ff9bed1a
6 changed files with 41 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
application/controllers/Items.php
View File

@@ -38,7 +38,6 @@ class Items extends Secure_area implements iData_controller
$this->load->view('items/manage', $data);
$this->_remove_duplicate_cookies();
}
function find_item_info()
@@ -83,8 +82,7 @@ class Items extends Secure_area implements iData_controller
$data_rows = get_items_manage_table_data_rows($items, $this);
// do not move this line to be after the json_encode otherwise the searhc function won't work!!
$this->_remove_duplicate_cookies();
echo json_encode(array('total_rows' => $total_rows, 'rows' => $data_rows, 'pagination' => $links));
}
@@ -265,7 +263,6 @@ class Items extends Secure_area implements iData_controller
echo $data_row;
$this->_remove_duplicate_cookies();
}
function view($item_id=-1)