diff --git a/ChangeLog b/ChangeLog index 319162f5a119867ec0d6c6e49f3fc3ed8b0658ce..07cd416c214cf56b64bdd85a4bf6097007cf306d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -19,6 +19,7 @@ Fix: Navigation on notes for shipments was not working. Fix: [ bug #1353 ] Email notifications, wrong URL. Fix: [ bug #1362 ] Note is not saved. Fix: tr/td balance. +Fix: [ bug #1360 ] note indicator for member tab. ***** ChangeLog for 3.5.2 compared to 3.5.1 ***** Fix: Can't add user for a task. diff --git a/htdocs/adherents/note.php b/htdocs/adherents/note.php index d92447434d4f994845d2477c9a481451e8a07d9c..9b9a466dbdd3766a12f78140df07510d2da97662 100644 --- a/htdocs/adherents/note.php +++ b/htdocs/adherents/note.php @@ -1,6 +1,6 @@ <?php /* Copyright (C) 2004 Rodolphe Quiedeville <rodolphe@quiedeville.org> - * Copyright (C) 2004-2007 Laurent Destailleur <eldy@users.sourceforge.net> + * Copyright (C) 2004-2014 Laurent Destailleur <eldy@users.sourceforge.net> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -19,7 +19,7 @@ /** * \file htdocs/adherents/note.php * \ingroup member - * \brief Fiche de notes sur un adherent + * \brief Tabe for note of a member */ require '../main.inc.php'; diff --git a/htdocs/core/lib/member.lib.php b/htdocs/core/lib/member.lib.php index 8ec1fdd4070fbcba431fd89c86e240b13d045ef5..2c775b6d739bc2bb9627e60cfd25dd7f2bc1e227 100644 --- a/htdocs/core/lib/member.lib.php +++ b/htdocs/core/lib/member.lib.php @@ -81,9 +81,14 @@ function member_prepare_head($object) // $this->tabs = array('entity:-tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__'); to remove a tab complete_head_from_modules($conf,$langs,$object,$head,$h,'member'); + $nbNote = 0; + if(!empty($object->note)) $nbNote++; + if(!empty($object->note_private)) $nbNote++; + if(!empty($object->note_public)) $nbNote++; $head[$h][0] = DOL_URL_ROOT.'/adherents/note.php?id='.$object->id; $head[$h][1] = $langs->trans("Note"); $head[$h][2] = 'note'; + if($nbNote > 0) $head[$h][1].= ' ('.$nbNote.')'; $h++; $head[$h][0] = DOL_URL_ROOT.'/adherents/document.php?id='.$object->id; @@ -130,7 +135,7 @@ function member_admin_prepare_head() $head[$h][1] = $langs->trans("ExtraFieldsMember"); $head[$h][2] = 'attributes'; $h++; - + $head[$h][0] = DOL_URL_ROOT.'/adherents/admin/adherent_type_extrafields.php'; $head[$h][1] = $langs->trans("ExtraFieldsMemberType"); $head[$h][2] = 'attributes_type';