From a1ddaa7d93f9dbdf209eb9202e458ed6b8b7e4f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Tue, 11 Aug 2026 17:47:52 +0200 Subject: [PATCH] NEW: Migrate event organization extrafields admin pages to the unified page Wire eventorganizationAdminPrepareHead() tabs to the unified admin/extrafields.php controller and register the actioncomm / eventorganization_conferenceorboothattendee elementtypes in the whitelist. Completes the wrapper-file removal committed in ba9928de5ad. --- htdocs/core/lib/admin_extrafields.lib.php | 22 ++++++++++++++++++++++ htdocs/core/lib/eventorganization.lib.php | 4 ++-- 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/htdocs/core/lib/admin_extrafields.lib.php b/htdocs/core/lib/admin_extrafields.lib.php index bb36302b3db..a4fcfbb8873 100644 --- a/htdocs/core/lib/admin_extrafields.lib.php +++ b/htdocs/core/lib/admin_extrafields.lib.php @@ -396,5 +396,27 @@ function getExtrafieldsAdminMap() 'helpurl' => '', 'langs' => array('admin', 'other', 'ecm'), ), + 'actioncomm' => array( + 'headfunction' => 'eventorganizationAdminPrepareHead', + 'headfile' => 'core/lib/eventorganization.lib.php', + 'tabid' => 'eventorganization_extrafields', + 'headlabel' => 'ExtraFields', + 'textobject' => 'ConferenceOrBooth', + 'headpicto' => 'eventorganization', + 'title' => 'EventOrganizationSetup', + 'helpurl' => '', + 'langs' => array('eventorganization', 'admin'), + ), + 'eventorganization_conferenceorboothattendee' => array( + 'headfunction' => 'eventorganizationAdminPrepareHead', + 'headfile' => 'core/lib/eventorganization.lib.php', + 'tabid' => 'conferenceorboothattendee_extrafields', + 'headlabel' => 'ConferenceOrBoothAttendeeExtraFields', + 'textobject' => 'ConferenceOrBoothAttendee', + 'headpicto' => 'eventorganization', + 'title' => 'EventOrganizationSetup', + 'helpurl' => '', + 'langs' => array('eventorganization', 'admin'), + ), ); } diff --git a/htdocs/core/lib/eventorganization.lib.php b/htdocs/core/lib/eventorganization.lib.php index 78e76f79842..4521dab9132 100644 --- a/htdocs/core/lib/eventorganization.lib.php +++ b/htdocs/core/lib/eventorganization.lib.php @@ -46,7 +46,7 @@ function eventorganizationAdminPrepareHead() $h++; - $head[$h][0] = DOL_URL_ROOT.'/admin/eventorganization_confbooth_extrafields.php'; + $head[$h][0] = dolBuildUrl(DOL_URL_ROOT.'/admin/extrafields.php', array('elementtype' => 'actioncomm')); $head[$h][1] = $langs->trans("ExtraFields")." (".$langs->trans("EventOrganizationConfOrBooth").")"; $nbExtrafields = $extrafields->attributes['actioncomm']['count']; if ($nbExtrafields > 0) { @@ -55,7 +55,7 @@ function eventorganizationAdminPrepareHead() $head[$h][2] = 'eventorganization_extrafields'; $h++; - $head[$h][0] = DOL_URL_ROOT.'/admin/eventorganization_confboothattendee_extrafields.php'; + $head[$h][0] = dolBuildUrl(DOL_URL_ROOT.'/admin/extrafields.php', array('elementtype' => 'eventorganization_conferenceorboothattendee')); $head[$h][1] = $langs->trans("ExtraFields")." (".$langs->trans("Attendees").")"; $nbExtrafields = $extrafields->attributes['eventorganization_conferenceorboothattendee']['count']; if ($nbExtrafields > 0) {