$fortune
@@ -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) ).',';
}
}
}
@@ -421,6 +424,7 @@ EOF;
'status_id' => 'status_name',
'item_author' => 'item_author_backend',
'item_customer' => 'item_customer',
+ 'lock_id' => 'lock_name',
);
foreach($table as $id => $row) {
@@ -640,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')
@@ -663,7 +667,6 @@ class Sklad_DB extends PDO {
//SELECT
$sql="SELECT *$group_concat_query FROM `$class`\n";
- //$sql="SELECT * FROM `$class`\n";
//JOIN
if(isset($join[$class])) foreach($join[$class] as $j) $sql .= "LEFT JOIN `$j` USING($j$suffix_id)\n";
if(isset($join2[$class])) foreach($join2[$class] as $j => $c) $sql .= "LEFT JOIN `$j` USING($c)\n";
@@ -685,7 +688,7 @@ class Sklad_DB extends PDO {
//ORDER
if(!$order) $order = $class.$suffix_id.' DESC';
if($this->contains_history($class)) $order .= ",${class}_valid_from DESC";
- //$sql .= "ORDER BY $order\n"; //TODO: fixnout az budou opraveny vicenasobny carovy kody
+ $sql .= "ORDER BY $order\n";
//LIMIT/OFFSET
if($limit) {
$limit = $this->escape((int)$limit);
@@ -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;
@@ -744,7 +749,7 @@ class Sklad_DB extends PDO {
function get_columns($class,$disable_cols=array()) { //TODO: Not sure if compatible with non-MySQL DBs
$class = $this->escape($class);
- $sql = "SHOW COLUMNS FROM $class;";
+ $sql = "SHOW COLUMNS FROM `$class`;";
$columns = $this->safe_query_fetch($sql);
/*foreach($columns as $colk => $col) foreach($col as $key => $val) {
if(in_array($col['Field'],$disable_cols)) $columns[$colk]['Extra']='auto_increment';
@@ -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('
'); print_r($selectbox);
+ //return $selectbox;
//return array_filter($selectbox, 'ksort');
return array_filter($selectbox, 'natcasesort');
//array_multisort($selectbox); return $selectbox;
@@ -1019,6 +1025,14 @@ class Sklad_UI {
return true;
}
+ function check_locks() {
+ $result = $this->db->safe_query_fetch("SELECT * FROM `lock`;");
+ if(!empty($result)) {
+ echo T('There are locks:').' '.$this->html->render_item_table($result);
+ $this->post_redirect_get('', 'There are locks!', true);
+ }
+ }
+
function process_http_request_post($action=false, $class=false, $id=false, $force_redirect=false) {
if($_SERVER['REQUEST_METHOD'] != 'POST') return;
//echo(''); //DEBUG (maybe todo remove), HEADERS ALREADY SENT!!!!
@@ -1030,6 +1044,7 @@ class Sklad_UI {
* do: $values[$table][$id][$column]
*/
if(isset($_POST['values'])) {
+ $this->check_locks();
$values=array();
foreach($_POST['values'] as $table => $columns) {
foreach($columns as $column => $ids) {
@@ -1050,6 +1065,7 @@ class Sklad_UI {
case 'new':
$replace = false;
case 'edit':
+ $this->check_locks();
if(!isset($replace)) $replace = true;
$table = $class ? $class : 'item';
//print_r($values); //debug
@@ -1060,6 +1076,7 @@ class Sklad_UI {
$this->post_redirect_get($last, $message);
break;
case 'delete':
+ $this->check_locks();
if(!isset($_POST['sure']) || !$_POST['sure']) $this->post_redirect_get("$class/$id/edit", 'Sure user expected :-)');
$this->db->delete($class, $id) || $this->post_redirect_get("$class/$id/edit", "V tabulce $class jentak neco mazat nebudes chlapecku :-P");
$this->post_redirect_get("$class", "Neco (pravdepodobne /$class/$id) bylo asi smazano. Fnuk :'-(");
@@ -1097,8 +1114,11 @@ class Sklad_UI {
$PATH_CHUNKS = preg_split('/\//', $PATH_INFO);
//Sephirot:
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...
- echo $this->html->header($PATH_INFO,$this->db->auth->get_user());
+ 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) : '';
+ echo $this->html->header($PATH_INFO,$this->db->auth->get_user(),$headerhtml);
+ }
switch($PATH_CHUNKS[1]) { //TODO: Move some branches to plugins if possible
case 'test': //test
die('Tell me why you cry');