From f71299ff08173ed8ee286a3bef10adc18638b4c6 Mon Sep 17 00:00:00 2001
From: tDidierjean <thomas.didierjean@prestashop.com>
Date: Wed, 21 Dec 2011 13:05:29 +0000
Subject: [PATCH] // Changes to ajax tab loading in product page

---
 .../themes/template/products/attachments.tpl     |  2 +-
 admin-dev/themes/template/products/form.tpl      | 16 ++++++++++++++--
 .../themes/template/products/informations.tpl    | 16 ----------------
 controllers/admin/AdminProductsController.php    |  5 +++--
 4 files changed, 18 insertions(+), 21 deletions(-)

diff --git a/admin-dev/themes/template/products/attachments.tpl b/admin-dev/themes/template/products/attachments.tpl
index 6eabf56b6..a3ecbe830 100644
--- a/admin-dev/themes/template/products/attachments.tpl
+++ b/admin-dev/themes/template/products/attachments.tpl
@@ -104,7 +104,7 @@
 	
 	
 	<script type="text/javascript">
-		displayFlags(languages, id_language, allowEmployeeFormLang);
+		//displayFlags(languages, id_language, allowEmployeeFormLang);
 		$(document).ready(function() {
 
 			$("#addAttachment").live('click', function() {
diff --git a/admin-dev/themes/template/products/form.tpl b/admin-dev/themes/template/products/form.tpl
index 1a95cd274..9b46319cc 100644
--- a/admin-dev/themes/template/products/form.tpl
+++ b/admin-dev/themes/template/products/form.tpl
@@ -75,10 +75,22 @@
 		</div>
 	</div>
 	<script type="text/javascript">
-
 		var toload = new Array();
-
+		var tabs_preloaded = new Array();
 		$(document).ready(function(){
+			{foreach $tabs_preloaded as $k => $tab}
+				tabs_preloaded['{$k}'] = '{$tab}';
+			{/foreach}
+
+			$('.product-tab-content').each(function(){
+				var id = $(this).attr('id').substr(20);
+				var split_position = id.indexOf('-') + 1;
+				var btn_name = id.substr(split_position);
+
+			if (tabs_preloaded[btn_name])
+				if ($("#product-tab-content-"+id).hasClass('not-loaded'))
+					displayTabProductById('#link-'+id, id, false);
+			});
 
 			{if $is_pack}
 				$('#pack_product').attr('checked', 'checked');
diff --git a/admin-dev/themes/template/products/informations.tpl b/admin-dev/themes/template/products/informations.tpl
index 6ce4b4b80..894f73886 100644
--- a/admin-dev/themes/template/products/informations.tpl
+++ b/admin-dev/themes/template/products/informations.tpl
@@ -42,7 +42,6 @@
 	<script type="text/javascript">
 		var token = '{$token}';
 		var id_product = {if isset($product->id)}{$product->id}{else}0{/if};
-		var tabs_preloaded = new Array();
 
 		{$combinationImagesJs}
 		$(document).ready(function(){
@@ -51,21 +50,6 @@
 				updateMvtStatus($(this).val());
 			});
 			updateMvtStatus($(this).val());
-
-			{foreach $tabs_preloaded as $k => $tab}
-				tabs_preloaded['{$k}'] = '{$tab}';
-			{/foreach}
-
-			$('.product-tab-content').each(function(){
-				var id = $(this).attr('id').substr(20);
-				var split_position = id.indexOf('-') + 1;
-				var btn_name = id.substr(split_position);
-
-			if (tabs_preloaded[btn_name])
-				if ($("#product-tab-content-"+id).hasClass('not-loaded'))
-					displayTabProductById('#link-'+id, id, false);
-			});
-
 		});
 		function updateMvtStatus(id_mvt_reason)
 		{
diff --git a/controllers/admin/AdminProductsController.php b/controllers/admin/AdminProductsController.php
index 9d200076e..2c3d5ea94 100644
--- a/controllers/admin/AdminProductsController.php
+++ b/controllers/admin/AdminProductsController.php
@@ -2080,6 +2080,9 @@ class AdminProductsControllerCore extends AdminController
 		if(!method_exists($this, 'initForm'.$this->tab_display))
 			return;
 
+		// Used for loading each tab
+		$this->tpl_form_vars['tabs_preloaded'] = $this->tabs_preloaded;
+
 		$this->addJqueryUI('ui.datepicker');
 		// getLanguages init this->_languages
 		$this->getLanguages();
@@ -3116,8 +3119,6 @@ class AdminProductsControllerCore extends AdminController
 
 		$product->tags = Tag::getProductTags($product->id);
 
-		$data->assign('tabs_preloaded', $this->tabs_preloaded);
-
 		// TinyMCE
 		$iso_tiny_mce = $this->context->language->iso_code;
 		$iso_tiny_mce = (file_exists(_PS_JS_DIR_.'tiny_mce/langs/'.$iso_tiny_mce.'.js') ? $iso_tiny_mce : 'en');