// removing shop associations from product page

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15391 b9a71923-0436-4b27-9f14-aed3839534dd

admin-dev/themes/default/template/controllers/products/associations.tpl

@@ -71,16 +71,6 @@
 				<div class="hint" style="display:block;">{l s='The default category is the category which is displayed by default.'}</div>
 			</td>
 		</tr>
-		{if $is_multishop && !$is_shop_context}
-		<tr>
-			<td class="col-left">
-				<label>{l s='Associated shops:'}</label>
-			</td>
-			<td class="col-right">
-				{$asso_shop}
-			</td>
-		</tr>
-		{/if}
 	</table>
 <div class="separation"></div>
 	<table>

controllers/admin/AdminProductsController.php

@@ -2556,10 +2556,6 @@ class AdminProductsControllerCore extends AdminController
 
 		$tab_root = array('id_category' => $root->id, 'name' => $root->name);
 		$helper = new Helper();
-		$helper_form = new HelperForm();
-		$helper_form->table = 'product';
-		$helper_form->identifier = 'id_product';
-		$helper_form->id = $product->id;
 		$category_tree = $helper->renderCategoryTree($tab_root, $selected_cat, 'categoryBox', false, true, array(), false, true);
 		$data->assign(array('default_category' => $default_category,
 					'selected_cat_ids' => implode(',', array_keys($selected_cat)),
@@ -2568,8 +2564,6 @@ class AdminProductsControllerCore extends AdminController
 					'category_tree' => $category_tree,
 					'product' => $product,
 					'link' => $this->context->link,
-					'asso_shop' => $helper_form->renderAssoShop(),
-					'is_multishop' => Shop::isFeatureActive(),
 					'is_shop_context' => Shop::getContext() == Shop::CONTEXT_SHOP
 		));