// Fix change tab for controller of AdminQuickAccesses
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10187 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
@@ -223,13 +223,13 @@ $(document).ready(function()
|
|||||||
</div>
|
</div>
|
||||||
<div id="header_quick">
|
<div id="header_quick">
|
||||||
<script type="text/javascript">
|
<script type="text/javascript">
|
||||||
function quickSelect(elt)
|
function quickSelect(elt)
|
||||||
{
|
{
|
||||||
var eltVal = $(elt).val();
|
var eltVal = $(elt).val();
|
||||||
if (eltVal == "0") return false;
|
if (eltVal == "0") return false;
|
||||||
else if (eltVal.substr(eltVal.length - 6) == "_blank") window.open(eltVal.substr(0, eltVal.length - 6)+'&token={$token}', "_blank");
|
else if (eltVal.substr(eltVal.length - 6) == '_blank') window.open(eltVal.substr(0, eltVal.length - 6), '_blank');
|
||||||
else location.href = eltVal+'&token={$token}';
|
else location.href = eltVal;
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
<select onchange="quickSelect(this);" id="quick_select">
|
<select onchange="quickSelect(this);" id="quick_select">
|
||||||
<option value="0">{l s='Quick Access'}</option>
|
<option value="0">{l s='Quick Access'}</option>
|
||||||
|
|||||||
@@ -1089,7 +1089,7 @@ class AdminControllerCore extends Controller
|
|||||||
$quick_access = QuickAccess::getQuickAccesses($this->context->language->id);
|
$quick_access = QuickAccess::getQuickAccesses($this->context->language->id);
|
||||||
foreach ($quick_access as $index => $quick)
|
foreach ($quick_access as $index => $quick)
|
||||||
{
|
{
|
||||||
preg_match('/tab=(.+)(&.+)?$/', $quick['link'], $admin_tab);
|
preg_match('/controller=(.+)(&.+)?$/', $quick['link'], $admin_tab);
|
||||||
if (isset($admin_tab[1]))
|
if (isset($admin_tab[1]))
|
||||||
{
|
{
|
||||||
if (strpos($admin_tab[1], '&'))
|
if (strpos($admin_tab[1], '&'))
|
||||||
|
|||||||
Reference in New Issue
Block a user