lepsi hlasky v add relations (wolfuv pozadavek)

[mirrors/SokoMan.git] / index.php

diff --git a/index.php b/index.php
index 94d800268479350da856fd6a0ac8a2d25ebcbcd1..4f84219627f70dbce79a6c8f61ef19ca5212eb8c 100755 (executable)
--- a/index.php
+++ b/index.php
@@ -102,6 +102,8 @@ class HTML {
 
        function input($name=false, $value=false, $type='text', $placeholder=false, $options=false, $prefix='') {
                if($type == 'textarea') return $this->textarea($name, $value, $placeholder, $options, $prefix);
+               if($type == 'select') return $this->select($name, $placeholder, $value, $prefix);
+               //select(vendor, $selectbox ,false, prefix:);
                $html = T($prefix)."<input type='$type' ";
                if($name) $html.= "name='$name' ";
                if(!is_bool($value)) {
@@ -124,9 +126,9 @@ class HTML {
                return $html;
        }
 
-       function select($name, $selectbox, $default=false) {
+       function select($name, $selectbox, $default=false, $prefix='') {
                //echo('<pre>'); print_r($selectbox);
-               $html = "<select name='$name'>";
+               $html = T($prefix)."<select name='$name'>";
 
                if(!is_bool($default)) {
                        $value=$default; $title=$selectbox[$value];
@@ -360,7 +362,7 @@ EOF;
                $insert_url = '%d/new?insert[%c]=%v';
                $relations = array( //TODO: Autodetect??? //TODO: Add [edit] link to all classes
                        'model' => array(
-                               'model_id' => array(array('item',$where_url),array('barcode',$where_url),array('edit','model/%v/edit/'),array('barcode',$insert_url)),
+                               'model_id' => array(array('item',$where_url),array('barcode',$where_url),array('edit','model/%v/edit/'),array('barcode',$insert_url,false,'add barcode')),
                                'model_barcode' => array(array('store','assistant/%d?barcode=%v')),
                                'barcode_name' => array(array('store','assistant/%d?barcode=%v')),
                                'model_name' => array(array('google','http://google.com/search?q=%v')) //TODO: add manufacturer to google query
@@ -402,7 +404,8 @@ EOF;
                                                        //$condition = $relations_conditions[$destination[2]]($table,$id);
                                                        if(!eval($relations_conditions[$destination[2]])) continue;
                                                }
-                                               @$table[$id][$class.$suffix_relations] .= $this->link($destination[0], $destination_url, !preg_match('/http/', $destination_url) ).',';
+                                               $destination_title = isset($destination[3]) ? $destination[3] : $destination[0];
+                                               @$table[$id][$class.$suffix_relations] .= $this->link($destination_title, $destination_url, !preg_match('/http/', $destination_url) ).',';
                                        }
                                }
                        }
@@ -641,8 +644,8 @@ class Sklad_DB extends PDO {
                        'model' => array('barcode'=>'model_id')
                );
                $fields_search = array(
-                       'item'  => array('item_id','item_serial','model_name','barcode_name','model_barcode','model_descript','producer_name','vendor_name'),
-                       'model' => array('model_id','model_name','barcode_name','model_barcode','model_descript','producer_name')
+                       'item'  => array('item_id','item_serial','model_name','barcode_name','model_descript','producer_name','vendor_name'),
+                       'model' => array('model_id','model_name','barcode_name','model_descript','producer_name')
                ); //TODO Autodetect
                $group_concat = array(
                        'model' => array('barcode_name'=>'model_id')
@@ -727,7 +730,9 @@ class Sklad_DB extends PDO {
        }
 
        function safe_query_fetch($sql, $fatal=true, $fetch_flags = PDO::FETCH_ASSOC, $translate=true) {
-               $result = $this->safe_query($sql, $fatal)->fetchAll($fetch_flags);
+               $result = $this->safe_query($sql, $fatal);
+               if(!$fatal && !$result) return $result;
+               $result = $result->fetchAll($fetch_flags);
                $this->load_backend_data_to_query_results($result);
                if($translate) $this->translate_query_results($result);
                return $result;
@@ -771,6 +776,7 @@ class Sklad_DB extends PDO {
                        foreach($result as $row) $selectbox[$table.$suffix_id][$row[$table.$suffix_id]]=$row[$table.$suffix_name];
                }
                //echo('<pre>'); print_r($selectbox);
+               //return $selectbox;
                //return array_filter($selectbox, 'ksort');
                return array_filter($selectbox, 'natcasesort');
                //array_multisort($selectbox); return $selectbox;