From e16abacf91ed0936882b2196ae0e09167bf4a3ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Charl=C3=A8ne=20Benke?= <1179011+defrance@users.noreply.github.com> Date: Sun, 28 Jul 2024 18:48:58 +0200 Subject: [PATCH] NEW : allow link feature to task (#30235) * Update html.form.class.php * Create linkedobjectblock.tpl.php * Update task.php * Update linkedobjectblock.tpl.php * Update linkedobjectblock.tpl.php --- htdocs/core/class/html.form.class.php | 2 + htdocs/projet/tasks/task.php | 6 ++ .../tasks/tpl/linkedobjectblock.tpl.php | 86 +++++++++++++++++++ 3 files changed, 94 insertions(+) create mode 100644 htdocs/projet/tasks/tpl/linkedobjectblock.tpl.php diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index d1c6c58d832..a06b4e029fa 100644 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -9439,6 +9439,8 @@ class Form if (!isModEnabled('mrp')) { continue; // Do not show if module disabled } + } elseif ($objecttype == 'project_task') { + $tplpath = 'projet/tasks'; } global $linkedObjectBlock; diff --git a/htdocs/projet/tasks/task.php b/htdocs/projet/tasks/task.php index 617c6c263a0..31eeb7544e0 100644 --- a/htdocs/projet/tasks/task.php +++ b/htdocs/projet/tasks/task.php @@ -759,6 +759,12 @@ if ($id > 0 || !empty($ref)) { print $formfile->showdocuments('project_task', $filename, $filedir, $urlsource, $genallowed, $delallowed, $object->model_pdf); + // Show links to link elements + $linktoelem = $form->showLinkToObjectBlock($object, null, array('project_task')); + + $compatibleImportElementsList = false; + $somethingshown = $form->showLinkedObjectBlock($object, $linktoelem, $compatibleImportElementsList); + print '
'; // List of actions on element diff --git a/htdocs/projet/tasks/tpl/linkedobjectblock.tpl.php b/htdocs/projet/tasks/tpl/linkedobjectblock.tpl.php new file mode 100644 index 00000000000..3f5cda25074 --- /dev/null +++ b/htdocs/projet/tasks/tpl/linkedobjectblock.tpl.php @@ -0,0 +1,86 @@ + + * Copyright (C) 2014 Marcos GarcĂ­a + * Copyright (C) 2019 Laurent Destailleur + * Copyright (C) 2024 Charlene Benke + * + * 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 . + */ + +// Protection to avoid direct call of template +if (empty($conf) || !is_object($conf)) { + print "Error, template page can't be called as URL"; + exit(1); +} + +?> + + + +load("tasks"); + +$linkedObjectBlock = dol_sort_array($linkedObjectBlock, 'date', 'desc', 0, 0, 1); + +$total = 0; $ilink = 0; +foreach ($linkedObjectBlock as $key => $objectlink) { + $ilink++; + + $trclass = 'oddeven'; + if ($ilink == count($linkedObjectBlock) && empty($noMoreLinkedObjectBlockAfter) && count($linkedObjectBlock) <= 1) { + $trclass .= ' liste_sub_total'; + } ?> + + trans("Task"); ?> + global->MAIN_ENABLE_IMPORT_LINKED_OBJECT_LINES) { + print ' + + getNomUrl(1); ?> + date_start, 'day'); ?> + date_stop, 'day'); ?> + budget_amount; + echo price($objectlink->budget_amount); + ?> + getLibStatut(3); ?> + + ">transnoentitiesnoconv("RemoveLink"), 'unlink'); ?> + + + 1) { + ?> + + trans("Total"); ?> + + + + + + + + + +