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

// Fix bugs on Admin Orders

Browse Source
This commit is contained in:
rGaillard
2012-02-17 17:37:04 +00:00
parent 801dc04dac
commit ef69ac9925
4 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
admin-dev/themes/default/template/controllers/orders/form.tpl
View File

@@ -210,7 +210,11 @@
function resetBind()
{
$('.fancybox').fancybox();
$('.fancybox').fancybox({
'type': 'iframe',
'width': '50%',
'height': '100%'
});
/*$("#new_address").fancybox({
onClosed: useCart(id_cart)
});*/

4
admin-dev/themes/default/template/form_submit_ajax.tpl
View File

@@ -39,7 +39,7 @@
form_datas[this.name] = this.value;
});
$.each(form_selects, function() {
form_datas[this.name] = this.options.selectedIndex;
form_datas[this.name] = this[this.options.selectedIndex].value;
});
$.ajax({
type: this.method,
@@ -49,7 +49,7 @@
data : form_datas,
success : function(res)
{
$('#fancybox-content').html(res);
$('html').html(res);
}
});
});

9
classes/Validate.php
View File

@@ -366,8 +366,13 @@ class ValidateCore
*/
public static function isCleanHtml($html)
{
$events = 'onmousedown|onmousemove|onmmouseup|onmouseover|onmouseout|onload|onunload|onfocus|onblur|onchange';
$events .= '|onsubmit|ondblclick|onclick|onkeydown|onkeyup|onkeypress|onmouseenter|onmouseleave|onerror';
$events = 'onmousedown|onmousemove|onmmouseup|onmouseover|onmouseout|onload|onunload|onfocus|onblur|onchange
|onsubmit|ondblclick|onclick|onkeydown|onkeyup|onkeypress|onmouseenter|onmouseleave|onerror|onselect|onreset|onabort|ondragdrop|onresize|onactivate|onafterprint|onmoveend
|onafterupdate|onbeforeactivate|onbeforecopy|onbeforecut|onbeforedeactivate|onbeforeeditfocus|onbeforepaste|onbeforeprint|onbeforeunload|onbeforeupdate|onmove
|onbounce|oncellchange|oncontextmenu|oncontrolselect|oncopy|oncut|ondataavailable|ondatasetchanged|ondatasetcomplete|ondeactivate|ondrag|ondragend|ondragenter|onmousewheel
|ondragleave|ondragover|ondragstart|ondrop|onerrorupdate|onfilterchange|onfinish|onfocusin|onfocusout|onhashchange|onhelp|oninput|onlosecapture|onmessage|onmouseup|onmovestart
|onoffline|ononline|onpaste|onpropertychange|onreadystatechange|onresizeend|onresizestart|onrowenter|onrowexit|onrowsdelete|onrowsinserted|onscroll|onsearch|onselectionchange
|onselectstart|onstart|onstop';
return (!preg_match('/<[ \t\n]*script/i', $html) && !preg_match('/<?.*('.$events.')[ \t\n]*=/i', $html) && !preg_match('/.*script\:/i', $html));
}

2
controllers/admin/AdminTabsController.php
View File

@@ -71,7 +71,7 @@ class AdminTabsControllerCore extends AdminController
'position' => array(
'title' => $this->l('Position'),
'width' => 40,
'filter_key' => 'cp!position',
'filter_key' => 'a!position',
'position' => 'position'
)
);