dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[*] BO : groups attributes are now sortable

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8683 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
vChabot
2011-09-21 10:04:54 +00:00
parent 526a94a0e6
commit d0102a81b7
10 changed files with 241 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/ajax.php
+32
View File
@@ -823,3 +823,35 @@ if (array_key_exists('ajaxAttributesPositions', $_POST))
}
}
}
/* Modify group attribute position */
if (array_key_exists('ajaxGroupsAttributesPositions', $_POST))
{
$way = (int)(Tools::getValue('way'));
$id_attribute_group = (int)(Tools::getValue('id_attribute_group'));
$positions = Tools::getValue('attribute_group');
$new_positions = array();
foreach($positions as $k => $v)
if (count(explode('_', $v)) == 3)
$new_positions[] = $v;
foreach ($new_positions AS $position => $value)
{
// pos[1] = id_attribute_group, pos[2] = old position
$pos = explode('_', $value);
if (isset($pos[1]) AND (int)$pos[1] === $id_attribute_group)
{
if ($group_attribute = new AttributeGroup((int)$pos[1]))
if (isset($position) && $group_attribute->updatePosition($way, $position))
echo "ok position $position for group attribute $pos[1]\r\n";
else
echo '{"hasError" : true, "errors" : "Can not update group attribute '. $id_attribute_group . ' to position '.$position.' "}';
else
echo '{"hasError" : true, "errors" : "This group attribute ('.$id_attribute_group.') can t be loaded"}';
break;
}
}
}
admin-dev/tabs/AdminAttributes.php
+1 -1
View File
@@ -153,7 +153,7 @@ class AdminAttributes extends AdminTab
else
$this->_errors[] = Tools::displayError('You do not have permission to delete here.');
}
elseif (Tools::isSubmit('submitAddattribute'))
elseif (Tools::isSubmit('submitAdd'.$this->table))
{
$id_attribute = (int)Tools::getValue('id_attribute');
// Adding last position to the attribute if not exist
admin-dev/tabs/AdminAttributesGroups.php
+52 -4
View File
@@ -44,7 +44,8 @@ class AdminAttributesGroups extends AdminTab
$this->fieldsDisplay = array(
'name' => array('title' => $this->l('Name'), 'width' => 140, 'filter_key' => 'b!name'),
'attribute' => array('title' => $this->l('Attributes'), 'width' => 240, 'orderby' => false, 'search' => false));
'attribute' => array('title' => $this->l('Attributes'), 'width' => 240, 'orderby' => false, 'search' => false),
'position' => array('title' => $this->l('Position'), 'width' => 40,'filter_key' => 'cp!position', 'align' => 'center', 'position' => 'position'));
parent::__construct();
}
@@ -71,7 +72,8 @@ class AdminAttributesGroups extends AdminTab
return;
$this->adminAttributes->tabAccess = Profile::getProfileAccess(Context::getContext()->employee->id_profile, $this->id);
$this->adminAttributes->postProcess($this->token);
if (Tools::isSubmit('submitAddattribute') || Tools::isSubmit('submitDelattribute'))
$this->adminAttributes->postProcess($this->token);
if(Tools::getValue('submitDel'.$this->table))
{
@@ -89,6 +91,26 @@ class AdminAttributesGroups extends AdminTab
}
else
$this->_errors[] = Tools::displayError('You do not have permission to delete here.');
// clean position after delete
AttributeGroup::cleanPositions();
}
else if (Tools::isSubmit('submitAdd'.$this->table))
{
$id_attribute_group = (int)Tools::getValue('id_attribute_group');
// Adding last position to the attribute if not exist
if ($id_attribute_group <= 0)
{
$sql = 'SELECT `position`+1
FROM `'._DB_PREFIX_.'attribute_group`
ORDER BY position DESC';
// set the position of the new group attribute in $_POST for postProcess() method
$_POST['position'] = DB::getInstance()->getValue($sql);
}
// clean \n\r characters
foreach ($_POST as $key => $value)
if (preg_match('/^name_/Ui', $key))
$_POST[$key] = str_replace ('\n', '', str_replace('\r', '', $value));
parent::postProcess();
}
else
parent::postProcess();
@@ -129,11 +151,16 @@ class AdminAttributesGroups extends AdminTab
';
$irow = 0;
if ($this->_list AND isset($this->fieldsDisplay['position']))
{
$positions = array_map(create_function('$elem', 'return (int)$elem[\'position\'];'), $this->_list);
sort($positions);
}
foreach ($this->_list AS $tr)
{
$id = (int)($tr['id_'.$this->table]);
$id = (int)$tr['id_'.$this->table];
echo '
<tr'.($irow++ % 2 ? ' class="alt_row"' : '').'>
<tr'.($irow++ % 2 ? ' class="alt_row"' : '').' id="tr_'.$id.'_'.$tr['position'].'">
<td style="vertical-align: top; padding: 4px 0 4px 0" class="center"><input type="checkbox" name="'.$this->table.'Box[]" value="'.$id.'" class="noborder" /></td>
<td style="width: 140px; vertical-align: top; padding: 4px 0 4px 0; cursor: pointer" onclick="$(\'#attributes_'.$id.'\').slideToggle();">'.$tr['name'].'</td>
<td style="vertical-align: top; padding: 4px 0 4px 0; width: 340px">';
@@ -142,6 +169,27 @@ class AdminAttributesGroups extends AdminTab
</td>';
echo '
<td style="width: 140px; vertical-align: top; padding: 4px 0 4px 0; cursor: pointer" class="dragHandle">';
if ($this->_orderBy == 'position' AND $this->_orderWay != 'DESC')
{
echo '<a'.(!($tr['position'] != $positions[sizeof($positions) - 1]) ? ' style="display: none;"' : '').' href="'.self::$currentIndex.
'&'.$this->identifiersDnd[$this->identifier].'='.$id.'
&way=1&position='.((int)$tr['position'] + 1).'&token='.$this->token.'">
<img src="../img/admin/'.($this->_orderWay == 'ASC' ? 'down' : 'up').'.gif"
alt="'.$this->l('Down').'" title="'.$this->l('Down').'" /></a>';
echo '<a'.(!($tr['position'] != $positions[0]) ? ' style="display: none;"' : '').' href="'.self::$currentIndex.
'&'.$this->identifiersDnd[$this->identifier].'='.$id.'
&way=0&position='.((int)$tr['position'] - 1).'&token='.$this->token.'">
<img src="../img/admin/'.($this->_orderWay == 'ASC' ? 'up' : 'down').'.gif"
alt="'.$this->l('Up').'" title="'.$this->l('Up').'" /></a>';
}
else
echo (int)($tr['position'] + 1);
echo '
</td>
<td style="vertical-align: top; padding: 4px 0 4px 0" class="center">
<a href="'.self::$currentIndex.'&id_'.$this->table.'='.$id.'&update'.$this->table.'&token='.$this->token.'">
<img src="../img/admin/edit.gif" border="0" alt="'.$this->l('Edit').'" title="'.$this->l('Edit').'" /></a>&nbsp;
classes/AdminTab.php
+6 -2
View File
@@ -149,7 +149,7 @@ abstract class AdminTabCore
public $smarty;
protected $identifiersDnd = array('id_product' => 'id_product', 'id_category' => 'id_category_to_move','id_cms_category' => 'id_cms_category_to_move', 'id_cms' => 'id_cms', 'id_attribute' => 'id_attribute');
protected $identifiersDnd = array('id_product' => 'id_product', 'id_category' => 'id_category_to_move','id_cms_category' => 'id_cms_category_to_move', 'id_cms' => 'id_cms', 'id_attribute' => 'id_attribute', 'id_attribute_group' => 'id_attribute_group');
/** @var bool Redirect or not ater a creation */
protected $_redirect = true;
@@ -590,7 +590,11 @@ abstract class AdminTabCore
Tools::redirectAdmin(self::$currentIndex.'&conf=1&token='.$token);
}
elseif ($object->delete())
{
if(method_exists($object, 'cleanPositions'))
$object->cleanPositions();
Tools::redirectAdmin(self::$currentIndex.'&conf=1&token='.$token);
}
$this->_errors[] = Tools::displayError('An error occurred during deletion.');
}
}
@@ -1601,7 +1605,7 @@ abstract class AdminTabCore
$irow = 0;
if ($this->_list AND isset($this->fieldsDisplay['position']))
{
$positions = array_map(create_function('$elem', 'return (int)($elem[\'position\']);'), $this->_list);
$positions = array_map(create_function('$elem', 'return (int)$elem[\'position\'];'), $this->_list);
sort($positions);
}
if ($this->_list)
classes/AttributeGroup.php
+81 -1
View File
@@ -30,6 +30,7 @@ class AttributeGroupCore extends ObjectModel
/** @var string Name */
public $name;
public $is_color_group;
public $position;
/** @var string Public Name */
public $public_name;
@@ -38,7 +39,7 @@ class AttributeGroupCore extends ObjectModel
protected $fieldsValidate = array('is_color_group' => 'isBool');
protected $fieldsRequiredLang = array('name', 'public_name');
protected $fieldsSizeLang = array('name' => 64, 'public_name' => 64);
protected $fieldsValidateLang = array('name' => 'isGenericName', 'public_name' => 'isGenericName');
protected $fieldsValidateLang = array('name' => 'isGenericName', 'public_name' => 'isGenericName', 'position' => 'isInt');
protected $table = 'attribute_group';
protected $identifier = 'id_attribute_group';
@@ -61,6 +62,7 @@ class AttributeGroupCore extends ObjectModel
$this->validateFields();
$fields['is_color_group'] = (int)($this->is_color_group);
$fields['position'] = (int)($this->position);
return $fields;
}
@@ -208,5 +210,83 @@ class AttributeGroupCore extends ObjectModel
$result = Db::getInstance()->executeS('SELECT id_attribute AS id from `'._DB_PREFIX_.'attribute` WHERE id_attribute_group = '.(int)$this->id);
return $result;
}
/**
* Move a group attribute
* @param boolean $way Up (1) or Down (0)
* @param integer $position
* @return boolean Update result
*/
public function updatePosition($way, $position)
{
if (!$res = Db::getInstance()->ExecuteS('
SELECT ag.`position`, ag.`id_attribute_group`
FROM `'._DB_PREFIX_.'attribute_group` ag
WHERE ag.`id_attribute_group` = '.(int)Tools::getValue('id_attribute_group', 1).'
ORDER BY ag.`position` ASC'
))
return false;
foreach ($res AS $group_attribute)
if ((int)$group_attribute['id_attribute_group'] == (int)$this->id)
$movedGroupAttribute = $group_attribute;
if (!isset($movedGroupAttribute) || !isset($position))
return false;
// < and > statements rather than BETWEEN operator
// since BETWEEN is treated differently according to databases
return (Db::getInstance()->Execute('
UPDATE `'._DB_PREFIX_.'attribute_group`
SET `position`= `position` '.($way ? '- 1' : '+ 1').'
WHERE `position`
'.($way
? '> '.(int)$movedGroupAttribute['position'].' AND `position` <= '.(int)$position
: '< '.(int)$movedGroupAttribute['position'].' AND `position` >= '.(int)$position))
AND Db::getInstance()->Execute('
UPDATE `'._DB_PREFIX_.'attribute_group`
SET `position` = '.(int)$position.'
WHERE `id_attribute_group`='.(int)$movedGroupAttribute['id_attribute_group']));
}
/**
* Reorder group attribute position
* Call it after deleting a group attribute.
*
* @return bool $return
*/
public static function cleanPositions()
{
$return = true;
$sql = '
SELECT *
FROM `'._DB_PREFIX_.'attribute_group`
ORDER BY `position`';
$result = Db::getInstance()->ExecuteS($sql);
$sizeof = sizeof($result);
for ($i = 0; $i < $sizeof; $i++)
$return = Db::getInstance()->Execute('
UPDATE `'._DB_PREFIX_.'attribute_group`
SET `position` = '.(int)$i.'
WHERE `id_attribute_group` = '.(int)$result[$i]['id_attribute_group']);
return $return;
}
/**
* getHigherPosition
*
* Get the higher group attribute position
*
* @return integer $position
*/
public static function getHigherPosition()
{
$sql = 'SELECT `position`
FROM `'._DB_PREFIX_.'attribute_group`
ORDER BY position DESC';
return ((DB::getInstance()->getValue($sql)!==false)) ? DB::getInstance()->getValue($sql) : -1;
}
}
classes/Product.php
+1 -1
View File
@@ -2328,7 +2328,7 @@ class ProductCore extends ObjectModel
WHERE pa.`id_product` = '.(int)($this->id).'
AND al.`id_lang` = '.(int)($id_lang).'
AND agl.`id_lang` = '.(int)($id_lang).'
ORDER BY agl.`public_name`, a.`position` ASC';
ORDER BY ag.`position` ASC, a.`position` ASC';
return Db::getInstance()->ExecuteS($sql);
}
install-dev/php/add_group_attribute_position.php
+42
View File
@@ -0,0 +1,42 @@
<?php
/*
* 2007-2011 PrestaShop
*
* NOTICE OF LICENSE
*
* This source file is subject to the Open Software License (OSL 3.0)
* that is bundled with this package in the file LICENSE.txt.
* It is also available through the world-wide-web at this URL:
* http://opensource.org/licenses/osl-3.0.php
* If you did not receive a copy of the license and are unable to
* obtain it through the world-wide-web, please send an email
* to license@prestashop.com so we can send you a copy immediately.
*
* DISCLAIMER
*
* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
* versions in the future. If you wish to customize PrestaShop for your
* needs please refer to http://www.prestashop.com for more information.
*
* @author PrestaShop SA <contact@prestashop.com>
* @copyright 2007-2011 PrestaShop SA
* @version Release: $Revision: 6844 $
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
* International Registered Trademark & Property of PrestaShop SA
*/
function add_group_attribute_position()
{
$groups = Db::getInstance()->ExecuteS('
SELECT *
FROM `'._DB_PREFIX_.'attribute_group`');
$i = 0;
if (sizeof($groups) && is_array($groups))
foreach ($groups as $group)
{
Db::getInstance()->Execute('
UPDATE `'._DB_PREFIX_.'attribute_group`
SET `position` = '.$i++.'
WHERE `id_attribute_group` = '.(int)$group['id_attribute_group']);
}
}
install-dev/sql/db.sql
+1
View File
@@ -91,6 +91,7 @@ CREATE TABLE `PREFIX_attribute` (
CREATE TABLE `PREFIX_attribute_group` (
`id_attribute_group` int(10) unsigned NOT NULL auto_increment,
`is_color_group` tinyint(1) NOT NULL default '0',
`position` int(10) unsigned NOT NULL default '0',
PRIMARY KEY (`id_attribute_group`)
) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8;
install-dev/sql/upgrade/1.5.0.1.sql
+3 -1
View File
@@ -146,4 +146,6 @@ ALTER TABLE `PREFIX_attribute` ADD `position` INT( 10 ) UNSIGNED NOT NULL DEFAUL
ALTER TABLE `PREFIX_product_download` CHANGE `date_deposit` `date_add` DATETIME NOT NULL ;
ALTER TABLE `PREFIX_product_download` CHANGE `physically_filename` `filename` VARCHAR( 255 ) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL;
ALTER TABLE `PREFIX_product_download` ADD `id_product_attribute` INT( 10 ) UNSIGNED NOT NULL AFTER `id_product` , ADD INDEX ( `id_product_attribute` );
ALTER TABLE `PREFIX_product_download` ADD `is_shareable` TINYINT( 1 ) UNSIGNED NOT NULL DEFAULT '0' AFTER `active`
ALTER TABLE `PREFIX_product_download` ADD `is_shareable` TINYINT( 1 ) UNSIGNED NOT NULL DEFAULT '0' AFTER `active`;
ALTER TABLE `PREFIX_attribute_group` ADD `position` INT( 10 ) UNSIGNED NOT NULL DEFAULT '0';
js/admin-dnd.js
+22 -17
View File
@@ -91,7 +91,7 @@ $(document).ready(function() {
token: token
};
}
if (table.id.indexOf('attribute') != -1) {
if (table.id.indexOf('attribute') != -1 && table.id != 'attribute_group') {
params = {
ajaxAttributesPositions: true,
id_attribute_group: ids[1],
@@ -101,6 +101,14 @@ $(document).ready(function() {
};
}
if (table.id == 'attribute_group') {
params = {
ajaxGroupsAttributesPositions: true,
id_attribute_group: ids[1],
way: way,
token: token
}
}
$.ajax({
type: 'POST',
@@ -139,7 +147,7 @@ $(document).ready(function() {
}
else
{
if (table.id == 'product' || table.id.indexOf('attribute') != -1)
if (table.id == 'product' || table.id.indexOf('attribute') != -1 || table.id == 'attribute_group')
{
var reg = /_[0-9][0-9]*$/g;
}
@@ -149,30 +157,27 @@ $(document).ready(function() {
}
var up_reg = new RegExp('position=[-]?[0-9]+&');
tableDrag.find('tbody tr').each(function(i) {
tableDrag.children('tbody').children('tr').each(function(i) {
$(this).attr('id', $(this).attr('id').replace(reg, '_' + i));
// Update link position
// Update link position
// Up links
$(this).find('td.dragHandle a:odd').attr('href', $(this).find('td.dragHandle a:odd').attr('href').replace(up_reg, 'position='+ (i - 1) +'&'));
$(this).children('td.dragHandle a:odd').attr('href', $(this).children('td.dragHandle a:odd').attr('href').replace(up_reg, 'position='+ (i - 1) +'&'));
// Down links
$(this).find('td.dragHandle a:even').attr('href', $(this).find('td.dragHandle a:even').attr('href').replace(up_reg, 'position='+ (i + 1) +'&'));
$(this).children('td.dragHandle a:even').attr('href', $(this).children('td.dragHandle a:even').attr('href').replace(up_reg, 'position='+ (i + 1) +'&'));
});
tableDrag.find('tr').not('.nodrag').removeClass('alt_row').removeClass('not_alt_row');
tableDrag.find('tr:not(".nodrag"):odd').addClass('alt_row');
tableDrag.find('tr:not(".nodrag"):even').addClass('not_alt_row');
tableDrag.find('tr td.dragHandle a:hidden').show();
tableDrag.children('tbody').children('tr').not('.nodrag').removeClass('alt_row').removeClass('not_alt_row');
tableDrag.children('tbody').children('tr:not(".nodrag"):odd').addClass('alt_row');
tableDrag.children('tbody').children('tr:not(".nodrag"):even').addClass('not_alt_row');
tableDrag.children('tbody').children('tr').children('td.dragHandle').children('a:hidden').show();
if (alternate) {
tableDrag.find('tr td.dragHandle:first a:odd').hide();
tableDrag.find('tr td.dragHandle:last a:even').hide();
tableDrag.children('tbody').children('tr').children('td.dragHandle:first').children('a:odd').hide();
tableDrag.children('tbody').children('tr').children('td.dragHandle:last').children('a:even').hide();
}
else {
tableDrag.find('tr td.dragHandle:first a:even').hide();
tableDrag.find('tr td.dragHandle:last a:odd').hide();
tableDrag.children('tbody').children('tr').children('td.dragHandle:first').children('a:even').hide();
tableDrag.children('tbody').children('tr').children('td.dragHandle:last').children('a:odd').hide();
}
}
}