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

Move tabs of external modules at end

Browse Source
This commit is contained in:
Laurent Destailleur 2022-09-15 16:55:52 +02:00
parent 27f817d940
commit 6f0bf07fbe
3 changed files with 25 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
htdocs/core/lib/company.lib.php
View File

@ -281,7 +281,7 @@ function societe_prepare_head(Societe $object)
// Entries must be declared in modules descriptor with line // Entries must be declared in modules descriptor with line
// $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__'); to add new tab // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__'); to add new tab
// $this->tabs = array('entity:-tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__'); to remove a tab // $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, 'thirdparty'); complete_head_from_modules($conf, $langs, $object, $head, $h, 'thirdparty', 'add', 'core');
if ($user->socid == 0) { if ($user->socid == 0) {
// Notifications // Notifications
@ -392,11 +392,11 @@ function societe_prepare_head(Societe $object)
$head[$h][2] = 'agenda'; $head[$h][2] = 'agenda';
$h++; $h++;
// Log // Show more tabs from modules
/*$head[$h][0] = DOL_URL_ROOT.'/societe/info.php?socid='.$object->id; // Entries must be declared in modules descriptor with line
$head[$h][1] = $langs->trans("Info"); // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__'); to add new tab
$head[$h][2] = 'info'; // $this->tabs = array('entity:-tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__'); to remove a tab
$h++;*/ complete_head_from_modules($conf, $langs, $object, $head, $h, 'thirdparty', 'add', 'external');
complete_head_from_modules($conf, $langs, $object, $head, $h, 'thirdparty', 'remove'); complete_head_from_modules($conf, $langs, $object, $head, $h, 'thirdparty', 'remove');

19
htdocs/core/lib/functions.lib.php
View File

@ -9042,9 +9042,10 @@ function getLanguageCodeFromCountryCode($countrycode)
* 'ecm' to add a tab for another ecm view * 'ecm' to add a tab for another ecm view
* 'stock' to add a tab for warehouse view * 'stock' to add a tab for warehouse view
* @param string $mode 'add' to complete head, 'remove' to remove entries * @param string $mode 'add' to complete head, 'remove' to remove entries
* @param string $filterorigmodule Filter on module origin. 'external' will show only external modules. 'core' only core modules. No filter by default.
* @return void * @return void
*/ */
function complete_head_from_modules($conf, $langs, $object, &$head, &$h, $type, $mode = 'add') function complete_head_from_modules($conf, $langs, $object, &$head, &$h, $type, $mode = 'add', $filterorigmodule = '')
{ {
global $hookmanager, $db; global $hookmanager, $db;
@ -9064,15 +9065,29 @@ function complete_head_from_modules($conf, $langs, $object, &$head, &$h, $type,
if (verifCond($values[4])) { if (verifCond($values[4])) {
if ($values[3]) { if ($values[3]) {
if ($filterorigmodule) { // If a filter of module origin has been requested
if (strpos($values[3], '@')) { // This is an external module
if ($filterorigmodule != 'external') {
continue;
}
} else { // This looks a core module
if ($filterorigmodule != 'core') {
continue;
}
}
}
$langs->load($values[3]); $langs->load($values[3]);
} }
if (preg_match('/SUBSTITUTION_([^_]+)/i', $values[2], $reg)) { if (preg_match('/SUBSTITUTION_([^_]+)/i', $values[2], $reg)) {
// If label is "SUBSTITUION_..."
$substitutionarray = array(); $substitutionarray = array();
complete_substitutions_array($substitutionarray, $langs, $object, array('needforkey'=>$values[2])); complete_substitutions_array($substitutionarray, $langs, $object, array('needforkey'=>$values[2]));
$label = make_substitutions($reg[1], $substitutionarray); $label = make_substitutions($reg[1], $substitutionarray);
} else { } else {
// If label is "Label,Class,File,Method", we call the method to show content inside the badge
$labeltemp = explode(',', $values[2]); $labeltemp = explode(',', $values[2]);
$label = $langs->trans($labeltemp[0]); $label = $langs->trans($labeltemp[0]);
if (!empty($labeltemp[1]) && is_object($object) && !empty($object->id)) { if (!empty($labeltemp[1]) && is_object($object) && !empty($object->id)) {
dol_include_once($labeltemp[2]); dol_include_once($labeltemp[2]);
$classtoload = $labeltemp[1]; $classtoload = $labeltemp[1];
@ -9092,7 +9107,7 @@ function complete_head_from_modules($conf, $langs, $object, &$head, &$h, $type,
$head[$h][2] = str_replace('+', '', $values[1]); $head[$h][2] = str_replace('+', '', $values[1]);
$h++; $h++;
} }
} elseif (count($values) == 5) { // deprecated } elseif (count($values) == 5) { // case deprecated
dol_syslog('Passing 5 values in tabs module_parts is deprecated. Please update to 6 with permissions.', LOG_WARNING); dol_syslog('Passing 5 values in tabs module_parts is deprecated. Please update to 6 with permissions.', LOG_WARNING);
if ($values[0] != $type) { if ($values[0] != $type) {

4
htdocs/core/modules/modTicket.class.php
View File

@ -122,8 +122,8 @@ class modTicket extends DolibarrModules
$this->tabs = array( $this->tabs = array(
'thirdparty:+ticket:Tickets:@ticket:$user->rights->ticket->read:/ticket/list.php?socid=__ID__', 'thirdparty:+ticket:Tickets:ticket:$user->rights->ticket->read:/ticket/list.php?socid=__ID__',
'project:+ticket:Tickets:@ticket:$user->rights->ticket->read:/ticket/list.php?projectid=__ID__', 'project:+ticket:Tickets:ticket:$user->rights->ticket->read:/ticket/list.php?projectid=__ID__',
); );
// Dictionaries // Dictionaries