From 88f7cf32487e00a65e4c6ad2f2fa6526a1d113e3 Mon Sep 17 00:00:00 2001
From: Dany De Bontridder <dany@alchimerys.be>
Date: Sat, 20 Dec 2014 14:04:00 +0100
Subject: [PATCH] =?UTF-8?q?Task=20#1071=20-=20Acceuil=20=20:=20action=20en?=
 =?UTF-8?q?=20retard=20&=20action=20li=C3=A9=20Add=20mod=20for=20request?=
 =?UTF-8?q?=20from=20ajax?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 include/template/detail-action.php | 30 +++++++++++++++++++++++-------
 1 file changed, 23 insertions(+), 7 deletions(-)

diff --git a/include/template/detail-action.php b/include/template/detail-action.php
index d96c7c3b2..d73705e98 100644
--- a/include/template/detail-action.php
+++ b/include/template/detail-action.php
@@ -185,17 +185,33 @@
 		$base=HtmlInput::request_to_string(array("gDossier","ac","sa","sb","sc","f_id"));
 		for ($o=0;$o<count($action);$o++)
 		{
-			if ( $p_view != 'READ')
-				{
-			$rmAction=sprintf("javascript:if ( confirm('"._('Voulez-vous effacer cette action ')."')==true ) {remove_action('%s','%s','%s');}",
+			if ( $p_view != 'READ' && $p_base != 'ajax')
+			{
+                            $rmAction=sprintf("javascript:if ( confirm('"._('Voulez-vous effacer cette action ')."')==true ) {remove_action('%s','%s','%s');}",
 					dossier::id(),
 					$action[$o]['ag_id'],$_REQUEST['ag_id']);
-			$showAction='<a class="line" href="'.$base."&ag_id=".$action[$o]['ag_id'].'">';
-			$js= '<a class="tinybutton" id="acact'.$action[$o]['ag_id'].'" href="'.$rmAction.'">&#x2D5D;</a>';
-			echo '<li id="act'.$action[$o]['ag_id'].'">'.$showAction.$action[$o]['str_date']." ".$action[$o]['ag_ref']." ".
+                            $showAction='<a class="line" href="'.$base."&ag_id=".$action[$o]['ag_id'].'">';
+                            $js= '<a class="tinybutton" id="acact'.$action[$o]['ag_id'].'" href="'.$rmAction.'">&#x2D5D;</a>';
+                            echo '<li id="act'.$action[$o]['ag_id'].'">'.$showAction.$action[$o]['str_date']." ".$action[$o]['ag_ref']." ".
 					h($action[$o]['sub_title']).'('.h($action[$o]['dt_value']).')</a>'." "
 				.$js.'</li>';
-			} else {
+			} else 
+                        /*
+                         * Display detail requested from Ajax Div
+                         */
+                         if ( $p_base == 'ajax' )
+                         {
+                            $xaction = sprintf('view_action(%d,%d,%d)',$action[$o]['ag_id'],Dossier::id(),1);
+                            $showAction='<a class="line" href="javascript:'.$xaction.'">';
+                            echo '<li>'.$showAction.$action[$o]['str_date']." ".$action[$o]['ag_ref']." ".
+					h($action[$o]['sub_title']).'('.h($action[$o]['dt_value']).')</a>'." "
+				.'</li>';
+                         }
+                         /*
+                          * READ ONLY
+                          */
+                         else
+                         {
 				$showAction='<a class="line" href="'.$base."&ag_id=".$action[$o]['ag_id'].'">';
 				echo '<li>'.$showAction.$action[$o]['str_date']." ".$action[$o]['ag_ref']." ".
 					h($action[$o]['sub_title']).'('.h($action[$o]['dt_value']).')</a>'." "