From: Thomas Mudrunka Date: Fri, 24 Feb 2012 18:07:35 +0000 (+0100) Subject: Dalsi vylepseni pouzitelnosti listingu na mym malym displayi, Fixnuty undefined offset X-Git-Url: https://git.harvie.cz/?a=commitdiff_plain;h=9c310625219086c9dc5896d7bc1f40a0f86586df;p=mirrors%2FSokoMan.git Dalsi vylepseni pouzitelnosti listingu na mym malym displayi, Fixnuty undefined offset --- diff --git a/index.php b/index.php index e016034..b10f8f1 100755 --- a/index.php +++ b/index.php @@ -328,7 +328,7 @@ EOF; $where_url = '%d/?where[%c]==%v'; $relations = array( //TODO: Autodetect??? 'model' => array( - 'model_id' => array(array('item',$where_url)), + 'model_id' => array(array('item',$where_url),array('edit','model/%v/edit/')), 'model_barcode' => array(array('store','assistant/%d?barcode=%v')), 'model_name' => array(array('google','http://google.com/search?q=%v',true)) //TODO: add manufacturer to google query ), @@ -355,7 +355,7 @@ EOF; array(urlencode($destination[0]),urlencode($column),urlencode($value)), $destination[1] ); - if(isset($destination[2])) { + if(isset($destination[2]) && isset($relations_conditions[$destination[2]])) { //$condition = $relations_conditions[$destination[2]]($table,$id); if(!eval($relations_conditions[$destination[2]])) continue; } @@ -387,7 +387,7 @@ EOF; } function table_sort(&$table) { - $precedence = array('item_id', 'model_image', 'model_name','model_descript','category_name','status_name','room_name','item_quantity','item_price_in','item_price_out','item_relations'); + $precedence = array('item_id', 'model_image', 'model_name','model_descript','category_name','status_name','room_name','item_quantity','item_price_in','item_price_out','model_price_in','model_price_out','item_relations','model_relations'); $table_sorted = array(); foreach($table as $id => $row) { $table_sorted[$id] = array();