X-Git-Url: https://git.harvie.cz/?a=blobdiff_plain;f=index.php;h=f03be33f7158c8d33a1009488de0c27e99ae9e28;hb=e862fa82ff1ea1bccc993b38f7f4dca62d041372;hp=d6469e5149f088b7f26fc6a2a3970a8d85ca65a7;hpb=ee2e74152b83654cd26c2e913555f147e6fa19e2;p=mirrors%2FSokoMan.git diff --git a/index.php b/index.php index d6469e5..f03be33 100755 --- a/index.php +++ b/index.php @@ -471,6 +471,7 @@ EOF; 'model' => array('barcode_name'), 'barcode' => array('model_price_in','model_price_out','model_reserve','producer_name','producer_note','model_eshop_hide','category_name','model_countable','model_descript'), 'item' => array('model_descript','model_price_in','model_price_out','barcode_name','model_barcode','model_countable','model_reserve','model_eshop_hide','room_descript','room_author','producer_name','producer_note','vendor_note','location_author','location_gps','location_description'), + 'lock' => array('lock_author'), 'transaction' => array('transaction_author') ); //print_r($table); die(); @@ -1051,9 +1052,10 @@ class Sklad_UI { } function check_locks() { - $result = $this->db->safe_query_fetch("SELECT * FROM `lock`;"); + $user = $this->db->quote($this->db->auth->get_user_id()); + $result = $this->db->safe_query_fetch("SELECT * FROM `lock` WHERE `lock_author` != $user;"); if(!empty($result)) { - echo T('There are locks:').' '.$this->html->render_item_table($result); + echo T('There are locks:').' '.$this->html->render_item_table($result, 'lock'); $this->post_redirect_get('', 'There are locks!', true); } } @@ -1141,7 +1143,7 @@ class Sklad_UI { if(!isset($PATH_CHUNKS[1])) $PATH_CHUNKS[1]=''; if($_SERVER['REQUEST_METHOD'] != 'POST' && $PATH_CHUNKS[1]!='barcodeimg' && $PATH_CHUNKS[1]!='api') { //TODO: tyhle podminky naznacujou, ze je v navrhu nejaka drobna nedomyslenost... $result = $this->db->safe_query_fetch("SELECT * FROM `lock`;"); - $headerhtml = !empty($result) ? T('There are locks:').' '.$this->html->render_item_table($result) : ''; + $headerhtml = !empty($result) ? T('There are locks:').' '.$this->html->render_item_table($result, 'lock') : ''; echo $this->html->header($PATH_INFO,$this->db->auth->get_user(),$headerhtml); } switch($PATH_CHUNKS[1]) { //TODO: Move some branches to plugins if possible