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

// fix check default theme in AdminShopController

Browse Source
This commit is contained in:
lLefevre
2011-12-30 15:54:01 +00:00
parent b0a32d4654
commit 16f183e8a7
2 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/admin/AdminShopController.php
+8 -1
View File
@@ -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(
js/toolbar.js
+4 -2
View File
@@ -28,12 +28,14 @@ $(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');
} }
} }
}); });
}); // end bind }); // end bind
// if count errors // if count errors
$('#hideError').live('click', function(e) $('#hideError').live('click', function(e)
{ {
e.preventDefault(); e.preventDefault();
@@ -43,7 +45,7 @@ $(document).ready(function(){
return false; return false;
}); });
// if count warnings // if count warnings
$('#linkSeeMore').live('click', function(e){ $('#linkSeeMore').live('click', function(e){
e.preventDefault(); e.preventDefault();
$('#seeMore').show('slow'); $('#seeMore').show('slow');