[Noalyss-commit] [noalyss] 02/02: Task #1071 - Acceuil : action en retard & action lié Add mod for request from ajax

[Dany De Bontridder]

sparkyx pushed a commit to branch master
in repository noalyss.

commit 88f7cf32487e00a65e4c6ad2f2fa6526a1d113e3
Author: Dany De Bontridder <address@hidden>
Date:   Sat Dec 20 14:04:00 2014 +0100

    Task #1071 - Acceuil  : action en retard & action lié
    Add mod for request from ajax
---
 include/template/detail-action.php |   30 +++++++++++++++++++++++-------
 1 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/include/template/detail-action.php 
b/include/template/detail-action.php
index d96c7c3..d73705e 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>'." "