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

Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop

Browse Source
This commit is contained in:
Laurent Destailleur 2019-07-04 15:43:15 +02:00
commit 9db86112bb
2 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
htdocs/core/class/fileupload.class.php
View File

@ -45,6 +45,8 @@ class FileUpload
{ {
global $db, $conf; global $db, $conf;
global $object; global $object;
global $hookmanager;
$hookmanager->initHooks(array('fileupload'));
$this->fk_element=$fk_element; $this->fk_element=$fk_element;
$this->element=$element; $this->element=$element;
@ -183,6 +185,18 @@ class FileUpload
) )
) )
); );
$hookmanager->executeHooks(
'overrideUploadOptions',
array(
'options' => &$options,
'element' => $element
),
$object,
$action,
$hookmanager
);
if ($options) { if ($options) {
$this->options = array_replace_recursive($this->options, $options); $this->options = array_replace_recursive($this->options, $options);
} }

8
htdocs/main.inc.php
View File

@ -1720,7 +1720,7 @@ function top_menu_user(User $user, Translate $langs)
$userImage = Form::showphoto('userphoto', $user, 0, 0, 0, 'photouserphoto userphoto', 'small', 0, 1); $userImage = Form::showphoto('userphoto', $user, 0, 0, 0, 'photouserphoto userphoto', 'small', 0, 1);
$userDropDownImage = Form::showphoto('userphoto', $user, 0, 0, 0, 'dropdown-user-image', 'small', 0, 1); $userDropDownImage = Form::showphoto('userphoto', $user, 0, 0, 0, 'dropdown-user-image', 'small', 0, 1);
} }
else{ else {
$nophoto='/public/theme/common/user_anonymous.png'; $nophoto='/public/theme/common/user_anonymous.png';
if ($user->gender == 'man') $nophoto='/public/theme/common/user_man.png'; if ($user->gender == 'man') $nophoto='/public/theme/common/user_man.png';
if ($user->gender == 'woman') $nophoto='/public/theme/common/user_woman.png'; if ($user->gender == 'woman') $nophoto='/public/theme/common/user_woman.png';
@ -1734,7 +1734,7 @@ function top_menu_user(User $user, Translate $langs)
$dropdownBody.= '<div id="topmenuloginmoreinfo" >'; $dropdownBody.= '<div id="topmenuloginmoreinfo" >';
// login infos // login infos
if (!empty($user->admin)) { if (! empty($user->admin)) {
$dropdownBody.= '<br><b>' . $langs->trans("Administrator").'</b>: '.yn($user->admin); $dropdownBody.= '<br><b>' . $langs->trans("Administrator").'</b>: '.yn($user->admin);
} }
if (! empty($user->socid)) // Add thirdparty for external users if (! empty($user->socid)) // Add thirdparty for external users
@ -1787,7 +1787,7 @@ function top_menu_user(User $user, Translate $langs)
$profilName = $user->getFullName($langs).' ('.$user->login.')'; $profilName = $user->getFullName($langs).' ('.$user->login.')';
if($user->admin){ if (! empty($user->admin)) {
$profilName = '<i class="far fa-star classfortooltip" title="'.$langs->trans("Administrator").'" ></i> '.$profilName; $profilName = '<i class="far fa-star classfortooltip" title="'.$langs->trans("Administrator").'" ></i> '.$profilName;
} }
@ -1847,6 +1847,8 @@ function top_menu_user(User $user, Translate $langs)
if (!$(event.target).closest("#topmenu-login-dropdown").length) { if (!$(event.target).closest("#topmenu-login-dropdown").length) {
// Hide the menus. // Hide the menus.
$("#topmenu-login-dropdown").removeClass("open"); $("#topmenu-login-dropdown").removeClass("open");
$("#dropdown-icon-down").show(); // use show/hide instead toggle for avoid conflict
$("#dropdown-icon-up").hide(); // use show/hide instead toggle for avoid conflict
} }
}); });