From d87c816038848932618554626266613b903cf127 Mon Sep 17 00:00:00 2001 From: Krystian Podemski Date: Thu, 3 Oct 2013 10:20:45 +0200 Subject: [PATCH 1/2] [*] CORE : Increasing the length of link_rewrite & name in Category.php In database this fields have varchar(128) so let's give the user full size of fields --- classes/Category.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/classes/Category.php b/classes/Category.php index a5fea0fbd..f787cce56 100644 --- a/classes/Category.php +++ b/classes/Category.php @@ -107,8 +107,8 @@ class CategoryCore extends ObjectModel 'date_upd' => array('type' => self::TYPE_DATE, 'validate' => 'isDate'), // Lang fields - 'name' => array('type' => self::TYPE_STRING, 'lang' => true, 'validate' => 'isCatalogName', 'required' => true, 'size' => 64), - 'link_rewrite' => array('type' => self::TYPE_STRING, 'lang' => true, 'validate' => 'isLinkRewrite', 'required' => true, 'size' => 64), + 'name' => array('type' => self::TYPE_STRING, 'lang' => true, 'validate' => 'isCatalogName', 'required' => true, 'size' => 128), + 'link_rewrite' => array('type' => self::TYPE_STRING, 'lang' => true, 'validate' => 'isLinkRewrite', 'required' => true, 'size' => 128), 'description' => array('type' => self::TYPE_HTML, 'lang' => true, 'validate' => 'isCleanHtml'), 'meta_title' => array('type' => self::TYPE_STRING, 'lang' => true, 'validate' => 'isGenericName', 'size' => 128), 'meta_description' => array('type' => self::TYPE_STRING, 'lang' => true, 'validate' => 'isGenericName', 'size' => 255), From d1956572a5999c398ceaf0e47a2d44928bba9cad Mon Sep 17 00:00:00 2001 From: Vincent Augagneur Date: Thu, 3 Oct 2013 10:29:40 +0200 Subject: [PATCH 2/2] //small fix on carrier wizard --- js/admin_carrier_wizard.js | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/js/admin_carrier_wizard.js b/js/admin_carrier_wizard.js index d2bb9f401..c58d0b7b5 100644 --- a/js/admin_carrier_wizard.js +++ b/js/admin_carrier_wizard.js @@ -474,7 +474,8 @@ function validateRange(index) function enableZone(index) { $('tr.fees').each( function () { - $(this).find('td:eq('+index+')').children('input').removeAttr('disabled'); + if ($(this).find('td:eq(1)').children('input[type=checkbox]:checked').length) + $(this).find('td:eq('+index+')').children('input').removeAttr('disabled'); }); } @@ -492,12 +493,18 @@ function enableRange(index) if ($(this).children('td').children('input:checkbox').attr('checked') == 'checked') enableZone(index); }); + $('tr.fees_all td:eq('+index+')').addClass('validated').removeClass('not_validated'); + if ($('.zone input[type=checkbox]:checked').length) + enableGlobalFees(index); + bind_inputs(); +} + +function enableGlobalFees(index) +{ $('span.fees_all').show(); $('tr.fees_all td:eq('+index+')').children('input').show().removeAttr('disabled'); $('tr.fees_all td:eq('+index+')').children('.currency_sign').show(); - $('tr.fees_all td:eq('+index+')').addClass('validated').removeClass('not_validated'); - $('tr.fees_all td:eq('+index+')').children('button').remove(); - bind_inputs(); + } function disableRange(index) @@ -636,7 +643,8 @@ function checkAllZones(elt) { $('.input_zone').attr('checked', 'checked'); $('.fees input:text').each( function () { - index = $(this).parent().index(); + index = $(this).closest('td').index(); + enableGlobalFees(index); if ($('tr.fees_all td:eq('+index+')').hasClass('validated')) { $(this).removeAttr('disabled');