[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Noalyss-commit] [noalyss] 03/03: Bug : when displaying an event in a bo
From: |
Dany De Bontridder |
Subject: |
[Noalyss-commit] [noalyss] 03/03: Bug : when displaying an event in a box via ajax , we get an error |
Date: |
Tue, 01 Mar 2016 12:08:32 +0000 |
sparkyx pushed a commit to branch master
in repository noalyss.
commit e301669a541fc10f38cad14bdac6ceb0776ae5f1
Author: Dany De Bontridder <address@hidden>
Date: Tue Mar 1 13:00:35 2016 +0100
Bug : when displaying an event in a box via ajax , we get an error
---
include/ajax/ajax_view_action.php | 8 ++------
include/template/detail-action.php | 3 ++-
2 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/include/ajax/ajax_view_action.php
b/include/ajax/ajax_view_action.php
index 2810818..2a15f0e 100644
--- a/include/ajax/ajax_view_action.php
+++ b/include/ajax/ajax_view_action.php
@@ -43,13 +43,9 @@ if ( ($g_user->can_write_action($ag_id) == true ||
$g_user->can_read_action($ag_
//$action=HtmlInput::array_to_string(array("gDossier","ag_id"),
$_GET)."&ac=FOLLOW&sa=detail";
$action=
"do.php?".http_build_query(array("gDossier"=>Dossier::id(),"ag_id"=>$ag_id,"ac"=>$menu->get('code_follow'),"sa"=>"detail"));
$code='ok';
- if ( $_GET['mod']== 1) :
- $forbidden=_("Accès interdit : vous n'avez pas accès à cette
information, contactez votre responsable");
- ?>
+?>
<a href="<?php echo $action?>" target="_blank" class="smallbutton"><?php echo
_("Modifier")?> </a>
- <?php
- $code='nok';
- endif;
+<?php
}
else
{
diff --git a/include/template/detail-action.php
b/include/template/detail-action.php
index d680d3b..9002dc1 100644
--- a/include/template/detail-action.php
+++ b/include/template/detail-action.php
@@ -340,6 +340,7 @@ if ( ($aCard[$i] != 0 && $p_view == 'READ') || $p_view !=
'READ'):
<?php endfor; ?>
</table>
</div>
+ <?php if ($p_view != "READ" ): ?>
<script language="JavaScript">
if ( $('e_march0') && $('e_march0').value =='') { toggleShowDetail();}
$('div_generate_document').hide();
@@ -351,7 +352,7 @@ function toggleShowDetail() {
catch (error) {alert(error);}
}
</script>
-
+<?php endif; ?>
<?php if ( $show_row != 0 ): ?>
<div>