[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Noalyss-commit] [noalyss] 07/219: Bug : cannot print action in profil C
From: |
Dany De Bontridder |
Subject: |
[Noalyss-commit] [noalyss] 07/219: Bug : cannot print action in profil Cannot add a export / printing in profile |
Date: |
Mon, 18 Dec 2017 13:22:27 -0500 (EST) |
sparkyx pushed a commit to branch master
in repository noalyss.
commit 5980cc89bfc3af2c64b9218b5db0ca4eed0da737
Author: Dany De Bontridder <address@hidden>
Date: Wed Jul 12 19:29:59 2017 +0200
Bug : cannot print action in profil
Cannot add a export / printing in profile
Conflicts:
include/ajax/ajax_get_profile.php
---
include/ajax/ajax_get_profile.php | 2 ++
include/class/profile_menu.class.php | 1 +
include/profile.inc.php | 2 +-
3 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/include/ajax/ajax_get_profile.php
b/include/ajax/ajax_get_profile.php
index 273b54c..586a92d 100644
--- a/include/ajax/ajax_get_profile.php
+++ b/include/ajax/ajax_get_profile.php
@@ -58,7 +58,9 @@ $a_tab[$call_tab]='tabs_selected';
<li class="<?php echo $a_tab['profile_gestion_div']?>"><a
href="javascript:void(0)" style=""
onclick="unselect_other_tab(this.parentNode.parentNode);this.parentNode.className='tabs_selected';profile_show('profile_gestion_div')"><?php
echo _('Action Gestion')?> </a></li>
<li class="<?php echo $a_tab['profile_repo_div']?>"><a
href="javascript:void(0)"
onclick="unselect_other_tab(this.parentNode.parentNode);this.parentNode.className='tabs_selected';profile_show('profile_repo_div')"><?php
echo _('Dépôts')?></a>
</ul>
+
<div style="clear: both"></div>
+
<?php endif; ?>
<?php
diff --git a/include/class/profile_menu.class.php
b/include/class/profile_menu.class.php
index 9be0059..145f5fd 100644
--- a/include/class/profile_menu.class.php
+++ b/include/class/profile_menu.class.php
@@ -62,6 +62,7 @@ class Profile_Menu extends Profile_Menu_sql
?>
<li id="sub<?php echo $menu['pm_id'] ?>">
+ <?php echo $me_code ?>
<?php echo $me_menu ?>
<?php echo $me_desc ?> <?php echo $me_def ?>
<?php $ret2=$this->cn->exec_sql("
diff --git a/include/profile.inc.php b/include/profile.inc.php
index a1c52f7..18f6f2c 100644
--- a/include/profile.inc.php
+++ b/include/profile.inc.php
@@ -331,7 +331,7 @@ if (isset($_POST['add_menu'])||isset($_POST['add_impress']))
* Do not insert twice the same menu
*/
$duplicate = $cn->get_value(" select count(*) from profile_menu where "
- . " pm_id_dep = $1 and me_code = $2",array($p_dep,$me_code));
+ . " pm_id_dep = $1 and me_code =
$2",array($pm_id_dep,$me_code));
if ( $duplicate > 0 ) {
throw new Exception(_('Doublon'));
}
- [Noalyss-commit] [noalyss] 169/219: For MSIE, force to unicode (still problem with MSIE11) !, (continued)
- [Noalyss-commit] [noalyss] 169/219: For MSIE, force to unicode (still problem with MSIE11) !, Dany De Bontridder, 2017/12/18
- [Noalyss-commit] [noalyss] 94/219: Fix background color for button 'modele operation', Dany De Bontridder, 2017/12/18
- [Noalyss-commit] [noalyss] 139/219: Javascript : small error, Dany De Bontridder, 2017/12/18
- [Noalyss-commit] [noalyss] 42/219: SQL : protection injection, Dany De Bontridder, 2017/12/18
- [Noalyss-commit] [noalyss] 75/219: PRINTJRN Use new class http_input, Dany De Bontridder, 2017/12/18
- [Noalyss-commit] [noalyss] 82/219: Fix Doxygen issue : @example must be in a function otherwise the detailed section of Doxygen disappear, Dany De Bontridder, 2017/12/18
- [Noalyss-commit] [noalyss] 64/219: Inplace_Edit : cosmetic, Dany De Bontridder, 2017/12/18
- [Noalyss-commit] [noalyss] 137/219: Infobulle : avoid that the info balloon exceed limit of the display, Dany De Bontridder, 2017/12/18
- [Noalyss-commit] [noalyss] 193/219: SansationLight add the readme.txt file with license, Dany De Bontridder, 2017/12/18
- [Noalyss-commit] [noalyss] 85/219: Task #1349 : si une seule catégorie de fiche , alors on ne doit pas la choisir, Dany De Bontridder, 2017/12/18
- [Noalyss-commit] [noalyss] 07/219: Bug : cannot print action in profil Cannot add a export / printing in profile,
Dany De Bontridder <=
- [Noalyss-commit] [noalyss] 79/219: PRINTGL : do not print accounting without operation, Dany De Bontridder, 2017/12/18
- [Noalyss-commit] [noalyss] 182/219: Icon move / fix, Dany De Bontridder, 2017/12/18
- [Noalyss-commit] [noalyss] 111/219: Comment Table, Dany De Bontridder, 2017/12/18
- [Noalyss-commit] [noalyss] 92/219: Esthetic : hide some columns when screen too small, Dany De Bontridder, 2017/12/18
- [Noalyss-commit] [noalyss] 39/219: Acc_Reconciliation : improve function get_amount_noautovat, set the prepare query inside the function, Dany De Bontridder, 2017/12/18
- [Noalyss-commit] [noalyss] 172/219: Merge branch 'master' of ns3:/srv/git/noalyss, Dany De Bontridder, 2017/12/18
- [Noalyss-commit] [noalyss] 143/219: ANC : balance analytique / comptabilité, corrige bug SQL, Dany De Bontridder, 2017/12/18
- [Noalyss-commit] [noalyss] 155/219: Task #1493 Encodage VEN , ACH, Ordre des opérations Déplacement du bouton modèle d'opérations, Dany De Bontridder, 2017/12/18
- [Noalyss-commit] [noalyss] 130/219: ANC groupe : little bug in PLANANC, allow a group null, Dany De Bontridder, 2017/12/18
- [Noalyss-commit] [noalyss] 142/219: ANC : balance croisée double fixe SQL query, Dany De Bontridder, 2017/12/18