X-Git-Url: https://git.harvie.cz/?a=blobdiff_plain;ds=inline;f=index.php;h=d6469e5149f088b7f26fc6a2a3970a8d85ca65a7;hb=ee2e74152b83654cd26c2e913555f147e6fa19e2;hp=67f38433d2d94180567ac6d3767feaae392471d0;hpb=56ca207aa1d1e5b2b52fdf7c5db97a22b69f01e1;p=mirrors%2FSokoMan.git

diff --git a/index.php b/index.php
index 67f3843..d6469e5 100755
--- a/index.php
+++ b/index.php
@@ -470,7 +470,8 @@ EOF;
 		$fields_hide = array(
 			'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')
+			'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'),
+			'transaction' => array('transaction_author')
 		);
 		//print_r($table); die();
 		if(isset($fields_hide[$class])) foreach($table as $id => $row) {
@@ -736,7 +737,9 @@ class Sklad_DB extends PDO {
 
 	function load_backend_data_to_query_results(&$result,$suffix_backend='_backend') {
 		$translate_cols = array(
-			'item_author' => 'return($this->auth->get_username_by_id($result[$key][$col]));'
+			'item_author' => 'return($this->auth->get_username_by_id($result[$key][$col]));',
+			'lock_author' => 'return($this->auth->get_username_by_id($result[$key][$col]));',
+			'transaction_author' => 'return($this->auth->get_username_by_id($result[$key][$col]));'
 		); //TODO: Hardcoded
 		foreach($result as $key => $row) {
 			foreach($translate_cols as $col => $backend) if(isset($result[$key][$col])){
@@ -938,13 +941,17 @@ class Sklad_UI {
 	function render_form_add($class) {
 		$columns = $this->db->get_columns($class);
 		$selectbox = $this->db->columns_get_selectbox($columns, $class);
-		return $this->html->render_insert_form($class, $columns, $selectbox);
+		$current=array('default'=>array(
+			'model_eshop_hide'=>1
+		));
+		return $this->html->render_insert_form($class, $columns, $selectbox, $current);
 	}
 
 	function render_form_edit($class, $id, $multi_insert) {
 		$columns = $this->db->get_columns($class);
 		$selectbox = $this->db->columns_get_selectbox($columns, $class);
 		$current = $this->db->get_listing($class, $id, 1);
+		//echo('<pre>');print_r($current);die();
 		return $this->html->render_insert_form($class, $columns, $selectbox, $current, false, false, $multi_insert);
 	}
 
@@ -1008,7 +1015,8 @@ class Sklad_UI {
 
 	function post_redirect_get($location, $message='', $error=false, $translate=true) {
 		$messaget = $translate ? T($message) : $message;
-		$url_args = $messaget != '' ? '?message='.urlencode($messaget) : '';
+		$separator = preg_match('/\?/', $location) ? '&' : '?';
+		$url_args = $messaget != '' ? $separator.'message='.urlencode($messaget) : '';
 		$location = $this->html->internal_url($location).$url_args;
 		header('Location: '.$location);
 		if($error) trigger_error($message);