Fix: Mauvaise activation du mode fckeditor des notes sur user/groups
This commit is contained in:
parent
4e6b07e7e0
commit
b0e2e42b86
@ -650,7 +650,7 @@ if (($action == 'create') || ($action == 'adduserldap'))
|
|||||||
print '<tr><td valign="top">';
|
print '<tr><td valign="top">';
|
||||||
print $langs->trans("Note");
|
print $langs->trans("Note");
|
||||||
print '</td><td>';
|
print '</td><td>';
|
||||||
if ($conf->fckeditor->enabled)
|
if ($conf->fckeditor->enabled && $conf->global->FCKEDITOR_ENABLE_USER)
|
||||||
{
|
{
|
||||||
require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php");
|
require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php");
|
||||||
$doleditor=new DolEditor('note','',180,'dolibarr_notes','',false);
|
$doleditor=new DolEditor('note','',180,'dolibarr_notes','',false);
|
||||||
|
|||||||
@ -181,10 +181,10 @@ if ($action == 'create')
|
|||||||
print '<td class="valeur"><input size="30" type="text" name="nom" value=""></td></tr>';
|
print '<td class="valeur"><input size="30" type="text" name="nom" value=""></td></tr>';
|
||||||
|
|
||||||
print "<tr>".'<td valign="top">'.$langs->trans("Note").'</td><td>';
|
print "<tr>".'<td valign="top">'.$langs->trans("Note").'</td><td>';
|
||||||
if ($conf->fckeditor->enabled)
|
if ($conf->fckeditor->enabled && $conf->global->FCKEDITOR_ENABLE_USER)
|
||||||
{
|
{
|
||||||
require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php");
|
require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php");
|
||||||
$doleditor=new DolEditor('note','',180,'dolibarr_notes','',false);
|
$doleditor=new DolEditor('note','',240,'dolibarr_notes','',true);
|
||||||
$doleditor->Create();
|
$doleditor->Create();
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
@ -404,15 +404,15 @@ else
|
|||||||
print "</tr>\n";
|
print "</tr>\n";
|
||||||
print '<tr><td width="25%" valign="top">'.$langs->trans("Note").'</td>';
|
print '<tr><td width="25%" valign="top">'.$langs->trans("Note").'</td>';
|
||||||
print '<td class="valeur">';
|
print '<td class="valeur">';
|
||||||
if ($conf->fckeditor->enabled)
|
if ($conf->fckeditor->enabled && $conf->global->FCKEDITOR_ENABLE_USER)
|
||||||
{
|
{
|
||||||
require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php");
|
require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php");
|
||||||
$doleditor=new DolEditor('note',$group->note,180,'dolibarr_notes','',false);
|
$doleditor=new DolEditor('note',$group->note,240,'dolibarr_notes','',true);
|
||||||
$doleditor->Create();
|
$doleditor->Create();
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
print '<textarea class="flat" name="note" rows="'.ROWS_4.'" cols="90">';
|
print '<textarea class="flat" name="note" rows="'.ROWS_8.'" cols="90">';
|
||||||
print $group->note;
|
print $group->note;
|
||||||
print '</textarea>';
|
print '</textarea>';
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user