mirror/opensourcepos
1
0
Fork 0
mirror of https://github.com/opensourcepos/opensourcepos.git synced 2026-07-10 23:17:08 -04:00
Code Issues Packages Projects Releases Wiki Activity

Rename migration script (#68)

Browse Source
This commit is contained in:
jekkos
2018-09-06 00:26:18 +02:00
committed by jekkos
parent 5d088f0283
commit 1ed56e388b
3 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
application/helpers/tabular_helper.php
View File

@@ -407,7 +407,7 @@ function get_item_data_row($item)
),
'edit' => anchor($controller_name."/view/$item->item_id", '<span class="glyphicon glyphicon-edit"></span>',
array('class' => 'modal-dlg', 'data-btn-submit' => $CI->lang->line('common_submit'), 'title' => $CI->lang->line($controller_name.'_update'))
), explode(',', $item->attribute_values)));
), explode(',', (property_exists($item, 'attribute_values')) ? $item->attribute_values : "")));
}

0
application/migrations/20180220100000_attributes.php → application/migrations/20180905100000_attributes.php
View File

2
application/models/Item.php
View File

@@ -193,7 +193,7 @@ class Item extends CI_Model
}
else if (count($filters['definition_ids']) > 0)
{
$this->db->select('GROUP_CONCAT(attribute_value) AS attribute_values');
$this->db->select('GROUP_CONCAT(attribute_value) AS attribute_values');
$this->db->join('attribute_links', 'attribute_links.item_id = items.item_id AND attribute_links.receiving_id IS NULL AND attribute_links.sale_id IS NULL AND definition_id IN (' . implode(',', $filters['definition_ids']) . ')', 'left');
$this->db->join('attribute_values', 'attribute_values.attribute_id = attribute_links.attribute_id', 'left');
$this->db->order_by('definition_id');