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

[-] BO : #PSTEST-18 : smalls improvements

Browse Source
This commit is contained in:
lLefevre
2011-12-16 16:03:44 +00:00
parent 715af52b80
commit 8d593239e3
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
admin-dev/themes/template/products/associations.tpl
View File

@@ -43,6 +43,17 @@
{l s='Please check a category in order to select the default category.'}
</div>
<table>
<tr>
<td class="col-left">
<label for="category_block">{l s='Associated categories:'}</label>
</td>
<td class="col-right">
<div id="category_block">{$category_tree}</div>
</td>
</tr>
<tr>
<td colspan="2">&nbsp;</td>
</tr>
<tr>
<td class="col-left">
<label for="id_category_default">{l s='Default category:'}</label>
@@ -56,17 +67,6 @@
</td>
</tr>
</table>
<br />
<table>
<tr>
<td class="col-left">
<label for="category_block">{l s='Associated categories:'}</label>
</td>
<td class="col-right">
<div id="category_block">{$category_tree}</div>
</td>
</tr>
</table>
{if $feature_shop_active}
<div class="separation"></div>
{* @todo use asso_shop from Helper *}

2
controllers/admin/AdminProductsController.php
View File

@@ -633,7 +633,7 @@ class AdminProductsControllerCore extends AdminController
if (!empty($is_virtual))
Product::updateIsVirtual($product->id);
$this->redirect_after = self::$currentIndex.'&id_product='.$product->id.'&id_category='.(!empty($_REQUEST['id_category'])?$_REQUEST['id_category']:'1').'&add'.$this->table.'&tabs=3&token='.($token ? $token : $this->token);
$this->redirect_after = self::$currentIndex.'&id_product='.$product->id.'&id_category='.(!empty($_REQUEST['id_category'])?$_REQUEST['id_category']:'1').'&add'.$this->table.'&action=Combinations&token='.($token ? $token : $this->token);
}
}
}