diff --git a/ChangeLog b/ChangeLog index 9694309d42e..7146eb646c8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -27,6 +27,8 @@ For users: - New: Can correct stock of a warehouse from warehouse card. - New: [ task #454 ] Add "No category" into filters on category. - New: Update language files (de, tr, pt). +- New: Auto check box on page to edit interface options of user. +- New: Add great britain provinces. - Fix: No images into product description lines as PDF generation does not work with this. diff --git a/dev/codesniffer/ruleset.xml b/dev/codesniffer/ruleset.xml index aae09c3597a..8d2bf842066 100755 --- a/dev/codesniffer/ruleset.xml +++ b/dev/codesniffer/ruleset.xml @@ -108,7 +108,10 @@ - + + 0 + + diff --git a/htdocs/adherents/admin/mailman.php b/htdocs/adherents/admin/mailman.php index a2bb43a906a..624018b05c9 100644 --- a/htdocs/adherents/admin/mailman.php +++ b/htdocs/adherents/admin/mailman.php @@ -178,7 +178,7 @@ if ($conf->global->ADHERENT_USE_MAILMAN) 'ADHERENT_MAILMAN_LISTS' ); - print_fiche_titre("Mailman mailing list system",$lien,''); + print_fiche_titre($langs->trans('MailmanTitle'), $lien,''); // JQuery activity print ''; + + print '
'; print ''; print ''; print ''; @@ -164,7 +176,7 @@ if ($action == 'edit') print $s?$s.' ':''; print ($conf->global->MAIN_LANG_DEFAULT=='auto'?$langs->trans("AutoDetectLang"):$langs->trans("Language_".$conf->global->MAIN_LANG_DEFAULT)); print ''; - print 'conf->MAIN_LANG_DEFAULT)?" checked":""); + print 'conf->MAIN_LANG_DEFAULT)?" checked":""); print ! empty($dolibarr_main_demo)?' disabled="disabled"':''; // Disabled for demo print '> '.$langs->trans("UsePersonalValue").''; print ''; @@ -175,10 +187,10 @@ if ($action == 'edit') $var=!$var; print ''.$langs->trans("MaxSizeList").''; print ''.$conf->global->MAIN_SIZE_LISTE_LIMIT.''; - print 'conf->MAIN_SIZE_LISTE_LIMIT)?" checked":""); + print 'conf->MAIN_SIZE_LISTE_LIMIT)?" checked":""); print ! empty($dolibarr_main_demo)?' disabled="disabled"':''; // Disabled for demo print '> '.$langs->trans("UsePersonalValue").''; - print ''; + print ''; print '
'; @@ -251,6 +263,7 @@ else } +dol_fiche_end(); llxFooter(); $db->close(); diff --git a/htdocs/user/perms.php b/htdocs/user/perms.php index b38940dd35f..1c304ded7a9 100644 --- a/htdocs/user/perms.php +++ b/htdocs/user/perms.php @@ -1,7 +1,7 @@ * Copyright (C) 2002-2003 Jean-Louis Bergamo - * Copyright (C) 2004-2010 Laurent Destailleur + * Copyright (C) 2004-2012 Laurent Destailleur * Copyright (C) 2004 Eric Seigne * Copyright (C) 2005-2012 Regis Houssin * @@ -66,6 +66,7 @@ if ($user->id <> $id && ! $canreaduser) accessforbidden(); /** * Actions */ + if ($action == 'addrights' && $caneditperms) { $edituser = new User($db); @@ -96,11 +97,9 @@ if ($action == 'delrights' && $caneditperms) -/* ************************************************************************** */ -/* */ -/* Visu et edition */ -/* */ -/* ************************************************************************** */ +/** + * View + */ llxHeader('',$langs->trans("Permissions")); @@ -110,9 +109,6 @@ $fuser = new User($db); $fuser->fetch($id); $fuser->getrights(); -/* - * Affichage onglets - */ $head = user_prepare_head($fuser); $title = $langs->trans("User"); @@ -321,7 +317,7 @@ if ($result) print ''; // Permission and tick - if ($fuser->admin && $objMod->rights_admin_allowed) // Permission own because admin + if (! empty($fuser->admin) && ! empty($objMod->rights_admin_allowed)) // Permission own because admin { if ($caneditperms) { @@ -376,6 +372,8 @@ else dol_print_error($db); print ''; +dol_fiche_end(); + llxFooter(); $db->close();