diff --git a/htdocs/admin/ecm_directories_extrafields.php b/htdocs/admin/ecm_directories_extrafields.php deleted file mode 100644 index c4b6ca1c718..00000000000 --- a/htdocs/admin/ecm_directories_extrafields.php +++ /dev/null @@ -1,107 +0,0 @@ - - * Copyright (C) 2003 Jean-Louis Bergamo - * Copyright (C) 2004-2013 Laurent Destailleur - * Copyright (C) 2012 Regis Houssin - * Copyright (C) 2012 Florian Henry - * Copyright (C) 2013 Philippe Grand - * Copyright (C) 2015 Claudio Aschieri - * Copyright (C) 2020-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/admin/ecm_directories_extrafields.php - * \ingroup ecm - * \brief Page to setup extra fields of ecm - */ - -// 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/ecm.lib.php'; - -if (!$user->admin) { - accessforbidden(); -} - -// Load translation files required by the page -$langs->loadLangs(array('admin', 'other', 'ecm')); - -$form = new Form($db); - -// List of supported format -$type2label = ExtraFields::getListOfTypesLabels(); - -$action = GETPOST('action', 'aZ09'); -$attrname = GETPOST('attrname', 'alpha'); -$elementtype = 'ecm_directories'; //Must be the $table_element of the class that manage extrafield - - - -/* - * Actions - */ - -require DOL_DOCUMENT_ROOT.'/core/actions_extrafields.inc.php'; - - -/* - * View - */ - -$textobject = $langs->transnoentitiesnoconv("ECM"); - -llxHeader('', $langs->trans("ECMSetup"), '', '', 0, 0, '', '', '', 'mod-admin page-ecm_directories_extrafields'); - -$linkback = ''.img_picto($langs->trans("BackToModuleList"), 'back', 'class="pictofixedwidth"').''.$langs->trans("BackToModuleList").''; - -print load_fiche_titre($langs->trans("ECMSetup"), $linkback, 'title_setup'); -print "
\n"; - -$head = ecm_admin_prepare_head(); - -print dol_get_fiche_head($head, 'attributes_ecm_directories', '', -1, ''); - -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'; -} - -// End of page -llxFooter(); -$db->close(); diff --git a/htdocs/admin/ecm_files_extrafields.php b/htdocs/admin/ecm_files_extrafields.php deleted file mode 100644 index 62f36b8b7e3..00000000000 --- a/htdocs/admin/ecm_files_extrafields.php +++ /dev/null @@ -1,106 +0,0 @@ - - * Copyright (C) 2003 Jean-Louis Bergamo - * Copyright (C) 2004-2013 Laurent Destailleur - * Copyright (C) 2012 Regis Houssin - * Copyright (C) 2012 Florian Henry - * Copyright (C) 2013 Philippe Grand - * Copyright (C) 2015 Claudio Aschieri - * Copyright (C) 2020-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/admin/ecm_files_extrafields.php - * \ingroup ecm - * \brief Page to setup extra fields of ecm - */ - -// 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/ecm.lib.php'; - -if (!$user->admin) { - accessforbidden(); -} - -// Load translation files required by the page -$langs->loadLangs(array('admin', 'other', 'ecm')); - -$form = new Form($db); - -// List of supported format -$type2label = ExtraFields::getListOfTypesLabels(); - -$action = GETPOST('action', 'aZ09'); -$attrname = GETPOST('attrname', 'alpha'); -$elementtype = 'ecm_files'; //Must be the $table_element of the class that manage extrafield - - -/* - * Actions - */ - -require DOL_DOCUMENT_ROOT.'/core/actions_extrafields.inc.php'; - - -/* - * View - */ - -$textobject = $langs->transnoentitiesnoconv("ECM"); - -llxHeader('', $langs->trans("ECMSetup"), '', '', 0, 0, '', '', '', 'mod-admin page-ecm_files_extrafields'); - -$linkback = ''.img_picto($langs->trans("BackToModuleList"), 'back', 'class="pictofixedwidth"').''.$langs->trans("BackToModuleList").''; - -print load_fiche_titre($langs->trans("ECMSetup"), $linkback, 'title_setup'); -print "
\n"; - -$head = ecm_admin_prepare_head(); - -print dol_get_fiche_head($head, 'attributes_ecm_files', '', -1, ''); - -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'; -} - -// End of page -llxFooter(); -$db->close(); diff --git a/htdocs/core/lib/admin_extrafields.lib.php b/htdocs/core/lib/admin_extrafields.lib.php index f6c99db6151..bb36302b3db 100644 --- a/htdocs/core/lib/admin_extrafields.lib.php +++ b/htdocs/core/lib/admin_extrafields.lib.php @@ -374,5 +374,27 @@ function getExtrafieldsAdminMap() 'helpurl' => '', 'langs' => array('admin', 'other', 'receptions'), ), + 'ecm_directories' => array( + 'headfunction' => 'ecm_admin_prepare_head', + 'headfile' => 'core/lib/ecm.lib.php', + 'tabid' => 'attributes_ecm_directories', + 'headlabel' => '', + 'textobject' => 'ECM', + 'headpicto' => '', + 'title' => 'ECMSetup', + 'helpurl' => '', + 'langs' => array('admin', 'other', 'ecm'), + ), + 'ecm_files' => array( + 'headfunction' => 'ecm_admin_prepare_head', + 'headfile' => 'core/lib/ecm.lib.php', + 'tabid' => 'attributes_ecm_files', + 'headlabel' => '', + 'textobject' => 'ECM', + 'headpicto' => '', + 'title' => 'ECMSetup', + 'helpurl' => '', + 'langs' => array('admin', 'other', 'ecm'), + ), ); } diff --git a/htdocs/core/lib/ecm.lib.php b/htdocs/core/lib/ecm.lib.php index e2920965e0e..be4b33d7d84 100644 --- a/htdocs/core/lib/ecm.lib.php +++ b/htdocs/core/lib/ecm.lib.php @@ -192,7 +192,7 @@ function ecm_admin_prepare_head() $head[$h][2] = 'ecm'; $h++; - $head[$h][0] = dolBuildUrl(DOL_URL_ROOT.'/admin/ecm_files_extrafields.php'); + $head[$h][0] = dolBuildUrl(DOL_URL_ROOT.'/admin/extrafields.php', array('elementtype' => 'ecm_files')); $head[$h][1] = $langs->trans("ExtraFieldsEcmFiles"); $nbExtrafields = $extrafields->attributes['ecm_files']['count']; if ($nbExtrafields > 0) { @@ -201,7 +201,7 @@ function ecm_admin_prepare_head() $head[$h][2] = 'attributes_ecm_files'; $h++; - $head[$h][0] = dolBuildUrl(DOL_URL_ROOT.'/admin/ecm_directories_extrafields.php'); + $head[$h][0] = dolBuildUrl(DOL_URL_ROOT.'/admin/extrafields.php', array('elementtype' => 'ecm_directories')); $head[$h][1] = $langs->trans("ExtraFieldsEcmDirectories"); $nbExtrafields = $extrafields->attributes['ecm_directories']['count']; if ($nbExtrafields > 0) {