From aaafc8b77f4965c7f8a011ca0f2f18341766e94a Mon Sep 17 00:00:00 2001 From: Thomas Mudrunka Date: Fri, 21 Oct 2011 15:28:28 +0200 Subject: [PATCH] Pridana podpora relacnich linku nesouvisejicich s DB --- assistants/store.inc.php | 3 ++- index.php | 25 +++++++++++++++++-------- 2 files changed, 19 insertions(+), 9 deletions(-) diff --git a/assistants/store.inc.php b/assistants/store.inc.php index fcc420f..f972576 100644 --- a/assistants/store.inc.php +++ b/assistants/store.inc.php @@ -1,8 +1,9 @@ html->form("$URL/2", 'GET', array( - array('barcode','','text',false,'autofocus','model_barcode:'), + array('barcode',$barcode,'text',false,'autofocus','model_barcode:'), array('quantity','1','text',false,false,'quantity:'), array(false,'STORE','submit') )); diff --git a/index.php b/index.php index 98f6c15..c1d3660 100755 --- a/index.php +++ b/index.php @@ -288,19 +288,28 @@ EOF; } function table_add_relations(&$table, $class, $suffix_relations='_relations') { + $where_url = '%d/?where[%c]==%v'; $relations = array( //TODO: Autodetect??? - 'model' => array('model_id' => array('item')), - 'category' => array('category_id' => array('item')), - 'producer' => array('producer_id' => array('item')), - 'vendor' => array('vendor_id' => array('item')), - 'room' => array('room_id' => array('item')), - 'status' => array('status_id' => array('item')), + 'model' => array( + 'model_id' => array(array('item',$where_url)), + 'model_barcode' => array(array('store','assistant/%d?barcode=%v')) + ), + 'category' => array('category_id' => array(array('item',$where_url))), + 'producer' => array('producer_id' => array(array('item',$where_url))), + 'vendor' => array('vendor_id' => array(array('item',$where_url))), + 'room' => array('room_id' => array(array('item',$where_url))), + 'status' => array('status_id' => array(array('item',$where_url))) ); foreach($table as $id => $row) { foreach($row as $column => $value) { if(isset($relations[$class][$column])) { foreach($relations[$class][$column] as $destination) { - @$table[$id][$class.$suffix_relations] .= $this->link($destination, "$destination/?where[$column]==$value").','; + $destination_url = str_replace( + array('%d','%c','%v'), + array($destination[0],$column,$value), + $destination[1] + ); + @$table[$id][$class.$suffix_relations] .= $this->link($destination[0], $destination_url).','; } } } @@ -344,8 +353,8 @@ EOF; function render_item_table($table,$class=false) { $this->table_add_images($table); - $this->table_add_barcodes($table); if($class) $this->table_add_relations($table,$class); + $this->table_add_barcodes($table); $this->table_collapse($table); $this->table_sort($table); return $this->table($table); -- 2.30.2