// fix check default theme in AdminShopController
This commit is contained in:
1 parent
b0a32d4654
commit
16f183e8a7
2 files changed
+10
-1
No files matched your search
@@ -313,6 +313,13 @@ class AdminShopControllerCore extends AdminController
|
|||||||
);
|
);
|
||||||
|
|
||||||
$themes = Theme::getThemes();
|
$themes = Theme::getThemes();
|
||||||
|
if (!isset($obj->id_theme))
|
||||||
|
foreach ($themes as $theme)
|
||||||
|
if (isset($theme->id))
|
||||||
|
{
|
||||||
|
$id_theme = $theme->id;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
$this->fields_form['input'][] = array(
|
$this->fields_form['input'][] = array(
|
||||||
'type' => 'theme',
|
'type' => 'theme',
|
||||||
@@ -390,7 +397,7 @@ class AdminShopControllerCore extends AdminController
|
|||||||
$this->fields_value = array(
|
$this->fields_value = array(
|
||||||
'id_group_shop' => $obj->id_group_shop,
|
'id_group_shop' => $obj->id_group_shop,
|
||||||
'active' => true,
|
'active' => true,
|
||||||
'id_theme_checked' => isset($obj->id_theme) ? $obj->id_theme : 0
|
'id_theme_checked' => isset($obj->id_theme) ? $obj->id_theme : $id_theme
|
||||||
);
|
);
|
||||||
|
|
||||||
$this->tpl_form_vars = array(
|
$this->tpl_form_vars = array(
|
||||||
|
|||||||
@@ -28,6 +28,8 @@ $(document).ready(function(){
|
|||||||
else if ($(this).hasClass("fix-toolbar") && (!window_is_more_than_twice_the_toolbar || (viewTop <= placeholderTop)) )
|
else if ($(this).hasClass("fix-toolbar") && (!window_is_more_than_twice_the_toolbar || (viewTop <= placeholderTop)) )
|
||||||
{
|
{
|
||||||
$(this).removeClass("fix-toolbar");
|
$(this).removeClass("fix-toolbar");
|
||||||
|
$(this).removeAttr('style');
|
||||||
|
$(this).parent().removeAttr('style');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|||||||
Reference in new issue
Block a user