From e609424894e07fff87f518ead6b78fde8b56ae07 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Tue, 11 Aug 2026 19:57:56 +0200 Subject: [PATCH] NEW: Migrate intervention (fichinter) extrafields admin pages to the unified page --- htdocs/core/lib/admin_extrafields.lib.php | 22 ++++ htdocs/core/lib/fichinter.lib.php | 4 +- .../fichinter/admin/fichinter_extrafields.php | 105 ----------------- .../admin/fichinterdet_extrafields.php | 107 ------------------ 4 files changed, 24 insertions(+), 214 deletions(-) delete mode 100644 htdocs/fichinter/admin/fichinter_extrafields.php delete mode 100644 htdocs/fichinter/admin/fichinterdet_extrafields.php diff --git a/htdocs/core/lib/admin_extrafields.lib.php b/htdocs/core/lib/admin_extrafields.lib.php index 0c31bfb79c2..18c8d2e4c45 100644 --- a/htdocs/core/lib/admin_extrafields.lib.php +++ b/htdocs/core/lib/admin_extrafields.lib.php @@ -734,5 +734,27 @@ function getExtrafieldsAdminMap() 'helpurl' => '', 'langs' => array('companies', 'admin', 'donations'), ), + 'fichinter' => array( + 'headfunction' => 'fichinter_admin_prepare_head', + 'headfile' => 'core/lib/fichinter.lib.php', + 'tabid' => 'attributes', + 'headlabel' => 'Interventions', + 'textobject' => 'Interventions', + 'headpicto' => 'intervention', + 'title' => 'InterventionsSetup', + 'helpurl' => '', + 'langs' => array('companies', 'admin', 'members', 'interventions'), + ), + 'fichinterdet' => array( + 'headfunction' => 'fichinter_admin_prepare_head', + 'headfile' => 'core/lib/fichinter.lib.php', + 'tabid' => 'attributesdet', + 'headlabel' => 'Interventions', + 'textobject' => 'Interventions', + 'headpicto' => 'intervention', + 'title' => 'InterventionsSetup', + 'helpurl' => '', + 'langs' => array('companies', 'admin', 'members', 'interventions'), + ), ); } diff --git a/htdocs/core/lib/fichinter.lib.php b/htdocs/core/lib/fichinter.lib.php index e55099a07ea..54dab9b4323 100644 --- a/htdocs/core/lib/fichinter.lib.php +++ b/htdocs/core/lib/fichinter.lib.php @@ -194,7 +194,7 @@ function fichinter_admin_prepare_head() // $this->tabs = array('entity:-tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__'); to remove a tab complete_head_from_modules($conf, $langs, null, $head, $h, 'fichinter_admin'); - $head[$h][0] = dolBuildUrl(DOL_URL_ROOT.'/fichinter/admin/fichinter_extrafields.php'); + $head[$h][0] = dolBuildUrl(DOL_URL_ROOT.'/admin/extrafields.php', array('elementtype' => 'fichinter')); $head[$h][1] = $langs->trans("ExtraFields"); $nbExtrafields = $extrafields->attributes['fichinter']['count']; if ($nbExtrafields > 0) { @@ -203,7 +203,7 @@ function fichinter_admin_prepare_head() $head[$h][2] = 'attributes'; $h++; - $head[$h][0] = dolBuildUrl(DOL_URL_ROOT.'/fichinter/admin/fichinterdet_extrafields.php'); + $head[$h][0] = dolBuildUrl(DOL_URL_ROOT.'/admin/extrafields.php', array('elementtype' => 'fichinterdet')); $head[$h][1] = $langs->trans("ExtraFieldsLines"); $nbExtrafields = $extrafields->attributes['fichinterdet']['count']; if ($nbExtrafields > 0) { diff --git a/htdocs/fichinter/admin/fichinter_extrafields.php b/htdocs/fichinter/admin/fichinter_extrafields.php deleted file mode 100644 index dcc12b402d5..00000000000 --- a/htdocs/fichinter/admin/fichinter_extrafields.php +++ /dev/null @@ -1,105 +0,0 @@ - - * Copyright (C) 2003 Jean-Louis Bergamo - * Copyright (C) 2004-2011 Laurent Destailleur - * Copyright (C) 2012 Regis Houssin - * Copyright (C) 2013 Florian Henry - * Copyright (C) 2024-2026 Frédéric France - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -/** - * \file htdocs/fichinter/admin/fichinter_extrafields.php - * \ingroup fichinter - * \brief Page to setup extra fields of ficheinter - */ - - -// Load Dolibarr environment -require '../../main.inc.php'; -/** - * @var Conf $conf - * @var DoliDB $db - * @var ExtraFields $extrafields - * @var HookManager $hookmanager - * @var Translate $langs - * @var User $user - */ -require_once DOL_DOCUMENT_ROOT.'/core/lib/fichinter.lib.php'; - -// Load translation files required by the page -$langs->loadLangs(array('companies', 'admin', 'members', 'interventions')); - -$form = new Form($db); - -// List of supported format -$type2label = ExtraFields::getListOfTypesLabels(); - -$action = GETPOST('action', 'aZ09'); -$attrname = GETPOST('attrname', 'alpha'); -$elementtype = 'fichinter'; //Must be the $element of the class that manage extrafield - -if (!$user->admin) { - accessforbidden(); -} - - -/* - * Actions - */ - -require DOL_DOCUMENT_ROOT.'/core/actions_extrafields.inc.php'; - - - -/* - * View - */ - -$textobject = $langs->transnoentitiesnoconv("Interventions"); - -llxHeader('', '', '', '', 0, 0, '', '', '', 'mod-fichinter page-admin_fichinter_extrafields'); - -$linkback = ''.img_picto($langs->trans("BackToModuleList"), 'back', 'class="pictofixedwidth"').''.$langs->trans("BackToModuleList").''; -print load_fiche_titre($langs->trans("InterventionsSetup"), $linkback, 'title_setup'); - -$head = fichinter_admin_prepare_head(); - -print dol_get_fiche_head($head, 'attributes', $langs->trans("Interventions"), -1, 'intervention'); - -require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php'; - -print dol_get_fiche_end(); - - -// Creation of an optional field -if ($action == 'create') { - print '
'; - print load_fiche_titre($langs->trans('NewAttribute')); - - require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php'; -} - -// Edition of an optional field -if ($action == 'edit' && !empty($attrname)) { - print "
"; - print load_fiche_titre($langs->trans("FieldEdition", $attrname)); - - require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php'; -} - -llxFooter(); - -$db->close(); diff --git a/htdocs/fichinter/admin/fichinterdet_extrafields.php b/htdocs/fichinter/admin/fichinterdet_extrafields.php deleted file mode 100644 index 98523598c60..00000000000 --- a/htdocs/fichinter/admin/fichinterdet_extrafields.php +++ /dev/null @@ -1,107 +0,0 @@ - - * Copyright (C) 2003 Jean-Louis Bergamo - * Copyright (C) 2004-2011 Laurent Destailleur - * Copyright (C) 2012 Regis Houssin - * Copyright (C) 2013 Florian Henry - * Copyright (C) 2024-2026 Frédéric France - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -/** - * \file htdocs/fichinter/admin/fichinter_extrafields.php - * \ingroup fichinter - * \brief Page to setup extra fields of ficheinter - */ - - -// Load Dolibarr environment -require '../../main.inc.php'; -/** - * @var Conf $conf - * @var DoliDB $db - * @var ExtraFields $extrafields - * @var HookManager $hookmanager - * @var Translate $langs - * @var User $user - */ -require_once DOL_DOCUMENT_ROOT.'/core/lib/fichinter.lib.php'; - - -// Load translation files required by the page -$langs->loadLangs(array('companies', 'admin', 'members', 'interventions')); - -$form = new Form($db); - -// List of supported format -$type2label = ExtraFields::getListOfTypesLabels(); - -$action = GETPOST('action', 'aZ09'); -$attrname = GETPOST('attrname', 'alpha'); -$elementtype = 'fichinterdet'; //Must be the $element of the class that manage extrafield - -if (!$user->admin) { - accessforbidden(); -} - - -/* - * Actions - */ - -require DOL_DOCUMENT_ROOT.'/core/actions_extrafields.inc.php'; - - - -/* - * View - */ - -$textobject = $langs->transnoentitiesnoconv("Interventions"); - -llxHeader('', '', '', '', 0, 0, '', '', '', 'mod-fichinter page-admin_fichinterdet_extrafields'); - -$linkback = ''.img_picto($langs->trans("BackToModuleList"), 'back', 'class="pictofixedwidth"').''.$langs->trans("BackToModuleList").''; -print load_fiche_titre($langs->trans("InterventionsSetup"), $linkback, 'title_setup'); - - -$head = fichinter_admin_prepare_head(); - -print dol_get_fiche_head($head, 'attributesdet', $langs->trans("Interventions"), -1, 'intervention'); - -require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php'; - -print dol_get_fiche_end(); - - -// Creation of an optional field -if ($action == 'create') { - print '
'; - print load_fiche_titre($langs->trans('NewAttribute')); - - require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php'; -} - -// Edition of an optional field -if ($action == 'edit' && !empty($attrname)) { - print "
"; - print load_fiche_titre($langs->trans("FieldEdition", $attrname)); - - require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php'; -} - -llxFooter(); - -$db->close();