From ff6b187ef327ed03458611fb161658452aef738a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?= <marcosgdf@gmail.com> Date: Sun, 20 Mar 2016 13:44:48 +0100 Subject: [PATCH] NEW Converted Form::showLinkedObjectBlock to a static function --- dev/skeletons/skeleton_card.php | 2 +- htdocs/comm/propal.php | 2 +- htdocs/commande/card.php | 2 +- htdocs/compta/facture.php | 2 +- htdocs/compta/facture/fiche-rec.php | 2 +- htdocs/contrat/card.php | 2 +- htdocs/core/class/commonobject.class.php | 4 ++-- htdocs/core/class/html.form.class.php | 2 +- htdocs/expedition/card.php | 2 +- htdocs/expensereport/card.php | 2 +- htdocs/fichinter/card.php | 2 +- htdocs/fourn/commande/card.php | 2 +- htdocs/fourn/facture/card.php | 2 +- htdocs/livraison/card.php | 2 +- htdocs/supplier_proposal/card.php | 2 +- 15 files changed, 16 insertions(+), 16 deletions(-) diff --git a/dev/skeletons/skeleton_card.php b/dev/skeletons/skeleton_card.php index 03f70955527..d6dc0cf58c1 100644 --- a/dev/skeletons/skeleton_card.php +++ b/dev/skeletons/skeleton_card.php @@ -322,7 +322,7 @@ if ($id && (empty($action) || $action == 'view' || $action == 'delete')) // Example 2 : Adding links to objects - //$somethingshown=$form->showLinkedObjectBlock($object); + //$somethingshown=Form::showLinkedObjectBlock($object); //$linktoelem = $form->showLinkToObjectBlock($object); //if ($linktoelem) print '<br>'.$linktoelem; diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php index 3c330576f04..7ff42a737b4 100644 --- a/htdocs/comm/propal.php +++ b/htdocs/comm/propal.php @@ -2350,7 +2350,7 @@ if ($action == 'create') $somethingshown = $formfile->show_documents('propal', $filename, $filedir, $urlsource, $genallowed, $delallowed, $object->modelpdf, 1, 0, 0, 28, 0, '', 0, '', $soc->default_lang); // Linked object block - $somethingshown = $form->showLinkedObjectBlock($object); + $somethingshown = Form::showLinkedObjectBlock($object); // Show links to link elements $linktoelem = $form->showLinkToObjectBlock($object); diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php index 78de2c70fa7..37fdf8aa7a4 100644 --- a/htdocs/commande/card.php +++ b/htdocs/commande/card.php @@ -2584,7 +2584,7 @@ if ($action == 'create' && $user->rights->commande->creer) $somethingshown = $formfile->show_documents('commande', $comref, $filedir, $urlsource, $genallowed, $delallowed, $object->modelpdf, 1, 0, 0, 28, 0, '', '', '', $soc->default_lang); // Linked object block - $somethingshown = $form->showLinkedObjectBlock($object); + $somethingshown = Form::showLinkedObjectBlock($object); // Show links to link elements //$linktoelem = $form->showLinkToObjectBlock($object); diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php index 5a00c796038..b70caf8b667 100644 --- a/htdocs/compta/facture.php +++ b/htdocs/compta/facture.php @@ -4046,7 +4046,7 @@ else if ($id > 0 || ! empty($ref)) $somethingshown = $formfile->numoffiles; // Linked object block - $somethingshown = $form->showLinkedObjectBlock($object); + $somethingshown = Form::showLinkedObjectBlock($object); // Show links to link elements $linktoelem = $form->showLinkToObjectBlock($object,array('order')); diff --git a/htdocs/compta/facture/fiche-rec.php b/htdocs/compta/facture/fiche-rec.php index 76a991dfdd1..e44c9e96fb4 100644 --- a/htdocs/compta/facture/fiche-rec.php +++ b/htdocs/compta/facture/fiche-rec.php @@ -983,7 +983,7 @@ else print '<a name="builddoc"></a>'; // ancre // Linked object block - $somethingshown = $form->showLinkedObjectBlock($object); + $somethingshown = Form::showLinkedObjectBlock($object); print '</div></div>'; diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php index 427e0962b6d..2b5b3961066 100644 --- a/htdocs/contrat/card.php +++ b/htdocs/contrat/card.php @@ -2015,7 +2015,7 @@ else $somethingshown = $formfile->show_documents('contract', $filename, $filedir, $urlsource, $genallowed, $delallowed, $object->modelpdf, 1, 0, 0, 28, 0, '', 0, '', $soc->default_lang); // Linked object block - $somethingshown = $form->showLinkedObjectBlock($object); + $somethingshown = Form::showLinkedObjectBlock($object); // Show links to link elements $linktoelem = $form->showLinkToObjectBlock($object); diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php index a65573a7947..d44230d3eb6 100644 --- a/htdocs/core/class/commonobject.class.php +++ b/htdocs/core/class/commonobject.class.php @@ -3115,13 +3115,13 @@ abstract class CommonObject * Show linked object block. * * @return int <0 if KO, >0 if OK - * @deprecated 3.8 Use instead $form->showLinkedObjectBlock($object) + * @deprecated 3.8 Use instead Form::showLinkedObjectBlock($object) * @see Form::showLinkedObjectBlock */ function showLinkedObjectBlock() { global $form; - return $form->showLinkedObjectBlock($this); + return Form::showLinkedObjectBlock($this); } diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index acbe2391816..4ce4d393355 100644 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -5077,7 +5077,7 @@ class Form * @param CommonObject $object Object we want to show links to * @return int <0 if KO, >0 if OK */ - function showLinkedObjectBlock(CommonObject $object) + public static function showLinkedObjectBlock(CommonObject $object) { global $conf,$langs,$hookmanager; global $bc; diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php index 8108c0e33cd..6b75f1c5142 100644 --- a/htdocs/expedition/card.php +++ b/htdocs/expedition/card.php @@ -1802,7 +1802,7 @@ else if ($id || $ref) $somethingshown=$formfile->show_documents('expedition',$objectref,$filedir,$urlsource,$genallowed,$delallowed,$object->modelpdf,1,0,0,28,0,'','','',$soc->default_lang); // Linked object block - $somethingshown = $form->showLinkedObjectBlock($object); + $somethingshown = Form::showLinkedObjectBlock($object); // Show links to link elements //$linktoelem = $form->showLinkToObjectBlock($object); diff --git a/htdocs/expensereport/card.php b/htdocs/expensereport/card.php index a31462cd977..285bed70386 100644 --- a/htdocs/expensereport/card.php +++ b/htdocs/expensereport/card.php @@ -2107,7 +2107,7 @@ if ($action != 'create' && $action != 'edit' && ($id || $ref)) $result = $object->add_object_linked('fichinter', GETPOST('LinkedFichinter')); } // Linked object block - $somethingshown = $form->showLinkedObjectBlock($object); + $somethingshown = Form::showLinkedObjectBlock($object); // Show links to link elements $linktoelements=array(); diff --git a/htdocs/fichinter/card.php b/htdocs/fichinter/card.php index 19dfd0f3fc2..4a55cad6d19 100644 --- a/htdocs/fichinter/card.php +++ b/htdocs/fichinter/card.php @@ -1783,7 +1783,7 @@ else if ($id > 0 || ! empty($ref)) $somethingshown=$formfile->show_documents('ficheinter',$filename,$filedir,$urlsource,$genallowed,$delallowed,$object->modelpdf,1,0,0,28,0,'','','',$soc->default_lang); // Linked object block - $somethingshown = $form->showLinkedObjectBlock($object); + $somethingshown = Form::showLinkedObjectBlock($object); // Show links to link elements //$linktoelem = $form->showLinkToObjectBlock($object); diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php index aadbc7f663f..95c2afe2c91 100644 --- a/htdocs/fourn/commande/card.php +++ b/htdocs/fourn/commande/card.php @@ -2954,7 +2954,7 @@ elseif (! empty($object->id)) $somethingshown=$formfile->numoffiles; // Linked object block - $somethingshown = $form->showLinkedObjectBlock($object); + $somethingshown = Form::showLinkedObjectBlock($object); // Show links to link elements //$linktoelem = $form->showLinkToObjectBlock($object); diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php index f76c411b0f2..65dacd0bcb0 100644 --- a/htdocs/fourn/facture/card.php +++ b/htdocs/fourn/facture/card.php @@ -2371,7 +2371,7 @@ else $somethingshown=$formfile->numoffiles; // Linked object block - $somethingshown = $form->showLinkedObjectBlock($object); + $somethingshown = Form::showLinkedObjectBlock($object); // Show links to link elements $linktoelem = $form->showLinkToObjectBlock($object,array('supplier_order')); diff --git a/htdocs/livraison/card.php b/htdocs/livraison/card.php index 34566a70e0b..410ade379fc 100644 --- a/htdocs/livraison/card.php +++ b/htdocs/livraison/card.php @@ -887,7 +887,7 @@ else $shipment->fetch($object->origin_id); // Linked object block - $somethingshown = $form->showLinkedObjectBlock($shipment); + $somethingshown = Form::showLinkedObjectBlock($shipment); // Show links to link elements //$linktoelem = $form->showLinkToObjectBlock($shipment); diff --git a/htdocs/supplier_proposal/card.php b/htdocs/supplier_proposal/card.php index b8eca021271..5dd6c7eb2b6 100644 --- a/htdocs/supplier_proposal/card.php +++ b/htdocs/supplier_proposal/card.php @@ -1832,7 +1832,7 @@ if ($action == 'create') $somethingshown = $formfile->show_documents('supplier_proposal', $filename, $filedir, $urlsource, $genallowed, $delallowed, $object->modelpdf, 1, 0, 0, 28, 0, '', 0, '', $soc->default_lang); // Linked object block - $somethingshown = $form->showLinkedObjectBlock($object); + $somethingshown = Form::showLinkedObjectBlock($object); // Show links to link elements //$linktoelem = $form->showLinkToObjectBlock($object); -- GitLab