lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Debug v17

Browse Source
This commit is contained in:
Laurent Destailleur 2022-10-25 10:53:19 +02:00
parent 68e1509834
commit 1618bfc902
3 changed files with 23 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
htdocs/core/lib/usergroups.lib.php
View File

@ -157,7 +157,10 @@ function user_prepare_head(User $object)
if (empty($user->socid)) { if (empty($user->socid)) {
// Notes // Notes
$nbNote = 0; $nbNote = 0;
if (!empty($object->note)) { if (!empty($object->note_public)) {
$nbNote++;
}
if (!empty($object->note_private)) {
$nbNote++; $nbNote++;
} }
$head[$h][0] = DOL_URL_ROOT.'/user/note.php?id='.$object->id; $head[$h][0] = DOL_URL_ROOT.'/user/note.php?id='.$object->id;

5
htdocs/core/tpl/notes.tpl.php
View File

@ -96,11 +96,6 @@ if ($module == 'propal') {
} }
//else dol_print_error('','Bad value '.$module.' for param module'); //else dol_print_error('','Bad value '.$module.' for param module');
if (isModEnabled('fckeditor') && !empty($conf->global->FCKEDITOR_ENABLE_SOCIETE)) {
$typeofdata = 'ckeditor:dolibarr_notes:100%:200::1:12:95%:0'; // Rem: This var is for all notes, not only thirdparties note.
} else {
$typeofdata = 'textarea:12:95%';
}
if (isModEnabled('fckeditor') && !empty($conf->global->FCKEDITOR_ENABLE_NOTE_PUBLIC)) { if (isModEnabled('fckeditor') && !empty($conf->global->FCKEDITOR_ENABLE_NOTE_PUBLIC)) {
$typeofdatapub = 'ckeditor:dolibarr_notes:100%:200::1:12:95%:0'; // Rem: This var is for all notes, not only thirdparties note. $typeofdatapub = 'ckeditor:dolibarr_notes:100%:200::1:12:95%:0'; // Rem: This var is for all notes, not only thirdparties note.
} else { } else {

30
htdocs/user/card.php
View File

@ -276,8 +276,8 @@ if (empty($reshook)) {
$object->job = GETPOST("job", 'alphanohtml'); $object->job = GETPOST("job", 'alphanohtml');
$object->signature = GETPOST("signature", 'restricthtml'); $object->signature = GETPOST("signature", 'restricthtml');
$object->accountancy_code = GETPOST("accountancy_code", 'alphanohtml'); $object->accountancy_code = GETPOST("accountancy_code", 'alphanohtml');
$object->note = GETPOST("note", 'restricthtml'); $object->note_public = GETPOST("note_public", 'restricthtml');
$object->note_private = GETPOST("note", 'restricthtml'); $object->note_private = GETPOST("note_private", 'restricthtml');
$object->ldap_sid = GETPOST("ldap_sid", 'alphanohtml'); $object->ldap_sid = GETPOST("ldap_sid", 'alphanohtml');
$object->fk_user = GETPOST("fk_user", 'int') > 0 ? GETPOST("fk_user", 'int') : 0; $object->fk_user = GETPOST("fk_user", 'int') > 0 ? GETPOST("fk_user", 'int') : 0;
$object->fk_user_expense_validator = GETPOST("fk_user_expense_validator", 'int') > 0 ? GETPOST("fk_user_expense_validator", 'int') : 0; $object->fk_user_expense_validator = GETPOST("fk_user_expense_validator", 'int') > 0 ? GETPOST("fk_user_expense_validator", 'int') : 0;
@ -1205,15 +1205,6 @@ if ($action == 'create' || $action == 'adduserldap') {
$parameters = array(); $parameters = array();
include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_add.tpl.php'; include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_add.tpl.php';
// Note
print '<tr><td class="tdtop">';
print $langs->trans("Note");
print '</td><td>';
require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
$doleditor = new DolEditor('note', GETPOSTISSET('note') ? GETPOST('note', 'restricthtml') : '', '', 120, 'dolibarr_notes', '', false, true, getDolGlobalString('FCKEDITOR_ENABLE_SOCIETE'), ROWS_3, '90%');
$doleditor->Create();
print "</td></tr>\n";
// Signature // Signature
print '<tr><td class="tdtop">'.$langs->trans("Signature").'</td>'; print '<tr><td class="tdtop">'.$langs->trans("Signature").'</td>';
print '<td class="wordbreak">'; print '<td class="wordbreak">';
@ -1222,6 +1213,23 @@ if ($action == 'create' || $action == 'adduserldap') {
print $doleditor->Create(1); print $doleditor->Create(1);
print '</td></tr>'; print '</td></tr>';
// Note private
print '<tr><td class="tdtop">';
print $langs->trans("NotePublic");
print '</td><td>';
require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
$doleditor = new DolEditor('note_public', GETPOSTISSET('note_public') ? GETPOST('note_public', 'restricthtml') : '', '', 100, 'dolibarr_notes', '', false, true, getDolGlobalString('FCKEDITOR_ENABLE_SOCIETE'), ROWS_3, '90%');
$doleditor->Create();
print "</td></tr>\n";
// Note private
print '<tr><td class="tdtop">';
print $langs->trans("NotePrivate");
print '</td><td>';
require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
$doleditor = new DolEditor('note_private', GETPOSTISSET('note_private') ? GETPOST('note_private', 'restricthtml') : '', '', 100, 'dolibarr_notes', '', false, true, getDolGlobalString('FCKEDITOR_ENABLE_SOCIETE'), ROWS_3, '90%');
$doleditor->Create();
print "</td></tr>\n";
print '</table><hr><table class="border centpercent">'; print '</table><hr><table class="border centpercent">';