[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Noalyss-commit] [noalyss] 06/09: Task #15 - Fenêtre gestion : impossib
From: |
Dany De Bontridder |
Subject: |
[Noalyss-commit] [noalyss] 06/09: Task #15 - Fenêtre gestion : impossible d'afficher les commentaires des actions dépendantes Bug : undefined variable margin , the parent cannot be displaid |
Date: |
Thu, 11 Feb 2016 15:16:47 +0000 |
sparkyx pushed a commit to branch master
in repository noalyss.
commit 6ac55928509957dcdec9e175bb6031336a5ed3b0
Author: Dany De Bontridder <address@hidden>
Date: Wed Feb 10 10:58:45 2016 +0100
Task #15 - Fenêtre gestion : impossible d'afficher les commentaires des
actions dépendantes
Bug : undefined variable margin , the parent cannot be displaid
---
include/class/class_follow_up.php | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/include/class/class_follow_up.php
b/include/class/class_follow_up.php
index ec9200e..c13d21a 100644
--- a/include/class/class_follow_up.php
+++ b/include/class/class_follow_up.php
@@ -200,7 +200,7 @@ class Follow_Up
$desc->name="ag_comment";
$desc->readOnly=$readonly;
$acomment=$this->db->get_array("SELECT agc_id, ag_id,
to_char(agc_date,'DD.MM.YYYY HH24:MI') as str_agc_date, agc_comment, tech_user
- FROM action_gestion_comment where ag_id=$1
order by agc_id;", array($this->ag_id)
+ FROM action_gestion_comment where ag_id=$1
order by agc_id", array($this->ag_id)
);
// List opération liées
@@ -2016,7 +2016,7 @@ class Follow_Up
for ($o=0; $o<count($a_parent); $o++)
{
$class=($this->ag_id == $a_parent[$o]['ag_id'])?'
class="highlight" ':'';
-
+
if ($p_view!='READ'&&$p_base!='ajax')
{
$rmAction=sprintf("return confirm_box(null,'"._('Voulez-vous
effacer cette action ')."', function () {remove_action('%s','%s','%s');});",
@@ -2037,7 +2037,7 @@ class Follow_Up
$xaction=sprintf('view_action(%d,%d,%d)',
$a_parent[$o]['ag_id'],
Dossier::id(), 1);
$showAction='<a class="line" href="javascript:'.$xaction.'">';
- echo '<li '.$class.'
>'.$margin.$showAction.$a_parent[$o]['str_date']." ".
+ echo '<li '.$class.'
>'.$showAction.$a_parent[$o]['str_date']." ".
h($a_parent[$o]['title']).'('.h($a_parent[$o]['action_ref']).')'.'</a>'." "
.'</li>';
}
@@ -2047,7 +2047,7 @@ class Follow_Up
else
{
$showAction='<a class="line"
href="'.$base."&ag_id=".$a_parent[$o]['ag_id'].'">';
- echo '<li '.$class.'
>'.$margin.$showAction.$a_parent[$o]['str_date']." ".
+ echo '<li '.$class.'
>'.$showAction.$a_parent[$o]['str_date']." ".
h($a_parent[$o]['sub_title']).'('.h($a_parent[$o]['action_ref']).')'.'</a>'." "
.'</li>';
}
- [Noalyss-commit] [noalyss] branch master updated (adcf886 -> 81fd85e), Dany De Bontridder, 2016/02/11
- [Noalyss-commit] [noalyss] 01/09: Change constructor by __construct, Dany De Bontridder, 2016/02/11
- [Noalyss-commit] [noalyss] 02/09: Bug when adding a empty note, Dany De Bontridder, 2016/02/11
- [Noalyss-commit] [noalyss] 03/09: Improve appearance waiting_box, Dany De Bontridder, 2016/02/11
- [Noalyss-commit] [noalyss] 04/09: small notice, Dany De Bontridder, 2016/02/11
- [Noalyss-commit] [noalyss] 05/09: replace phpcompta by noalyss, Dany De Bontridder, 2016/02/11
- [Noalyss-commit] [noalyss] 06/09: Task #15 - Fenêtre gestion : impossible d'afficher les commentaires des actions dépendantes Bug : undefined variable margin , the parent cannot be displaid,
Dany De Bontridder <=
- [Noalyss-commit] [noalyss] 07/09: doc, Dany De Bontridder, 2016/02/11
- [Noalyss-commit] [noalyss] 08/09: Add function to grant or revoke admin to a folder, Dany De Bontridder, 2016/02/11
- [Noalyss-commit] [noalyss] 09/09: Update unit test files, Dany De Bontridder, 2016/02/11