From 651e2d72b9c2ec0aab0be8fc10e7378d2e3b55b4 Mon Sep 17 00:00:00 2001
From: mDeflotte <maxence.deflotte@prestashop.com>
Date: Mon, 17 Oct 2011 15:50:54 +0000
Subject: [PATCH] // Improving admin list action "details"

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9400 b9a71923-0436-4b27-9f14-aed3839534dd
---
 .../themes/template/list_action_details.tpl   | 36 +++++++++++--------
 classes/HelperList.php                        | 10 +++++-
 2 files changed, 30 insertions(+), 16 deletions(-)

diff --git a/admin-dev/themes/template/list_action_details.tpl b/admin-dev/themes/template/list_action_details.tpl
index 69eb578a1..ccaad8fc6 100644
--- a/admin-dev/themes/template/list_action_details.tpl
+++ b/admin-dev/themes/template/list_action_details.tpl
@@ -26,7 +26,6 @@
 <script type="text/javascript">
 $(document).ready(function() {
 	$('#details_{$id}').click(function() {
-
 		if (typeof(this.dataMaped) == 'undefined') {
 			$.ajax({
 				url: 'index.php',
@@ -42,25 +41,33 @@ $(document).ready(function() {
 				context: this,
 				async: false,
 				success: function(data) {
-					$.each(data.data, function(it, row)
+					if(typeof(data.use_parent_structure) == 'undefined' || data.use_parent_structure)
+						$.each(data.data, function(it, row)
+						{
+							if($('#details_{$id}').parent().parent().hasClass('alt_row'))
+								var content = $('<tr class="details_{$id} alt_row"></tr>');
+							else
+								var content = $('<tr class="details_{$id}"></tr>');
+							content.append($('<td></td>'));
+							$.each(data.fields_display, function(it, line)
+							{
+								if (typeof(row[it]) == 'undefined')
+									content.append($('<td class="'+this.align+'"></td>'));
+								else
+									content.append($('<td class="'+this.align+'">'+row[it]+'</td>'));
+							});
+							content.append($('<td></td>'));
+							$('#details_{$id}').parent().parent().after(content);
+						});
+					else
 					{
-						//console.log(row);
 						if($('#details_{$id}').parent().parent().hasClass('alt_row'))
 							var content = $('<tr class="details_{$id} alt_row"></tr>');
 						else
 							var content = $('<tr class="details_{$id}"></tr>');
-						content.append($('<td></td>'));
-						$.each(data.fields_display, function(it, line)
-						{
-							if (typeof(row[it]) == 'undefined')
-								content.append($('<td class="'+this.align+'"></td>'));
-							else
-								content.append($('<td class="'+this.align+'">'+row[it]+'</td>'));
-						});
-						console.log($(this));
-						content.append($('<td></td>'));
+						content.append($('<td>'+data+'</td>').attr('colspan', $('#details_{$id}').parent().parent().find('td').length));
 						$('#details_{$id}').parent().parent().after(content);
-					});
+					}
 					this.dataMaped = true;
 					this.opened = false;
 				}
@@ -69,7 +76,6 @@ $(document).ready(function() {
 
 		if(this.opened)
 		{
-			console.log($(this).find('img'));
 			$(this).find('img').attr('src', '../img/admin/more.png');
 			$(this).parent().parent().parent().find('.details_{$id}').hide();
 			this.opened = false
diff --git a/classes/HelperList.php b/classes/HelperList.php
index 22342503b..8a6912ab1 100644
--- a/classes/HelperList.php
+++ b/classes/HelperList.php
@@ -318,15 +318,23 @@ class HelperListCore extends Helper
 	
 
 	/**
-	 * Display action to see details of a table row
+	 * Display action show details of a table row
 	 * This action need an ajax request with a return like this:
 	 *   {
+	 *     use_parent_structure: true // If false, data need to be an html
 	 *     data:
 	 *       [
 	 *         {field_name: 'value'}
 	 *       ],
 	 *     fields_display: // attribute $fieldsDisplay of the admin controller
 	 *   }
+	 * or somethins like this:
+	 *   {
+	 *     use_parent_structure: false // If false, data need to be an html
+	 *     data:
+	 *       '<p>My html content</p>',
+	 *     fields_display: // attribute $fieldsDisplay of the admin controller
+	 *   }
 	 */
 	protected function _displayDetailsLink($token = null, $id)
 	{