From d7dce1aac8b188833116b968bf287366b4ec3983 Mon Sep 17 00:00:00 2001
From: gloas <gloas@afi-sa.fr>
Date: Fri, 15 Jun 2018 12:23:33 +0200
Subject: [PATCH] dev #75882 fix trait conflicts
---
library/Class/ArticleCategorie.php | 5 ++++-
library/Class/SitothequeCategorie.php | 7 +++++--
library/Class/UserGroupCategorie.php | 5 ++++-
3 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/library/Class/ArticleCategorie.php b/library/Class/ArticleCategorie.php
index 17c9b9fad4e..f9209edde6d 100644
--- a/library/Class/ArticleCategorie.php
+++ b/library/Class/ArticleCategorie.php
@@ -84,7 +84,10 @@ class ArticleCategorieLoader extends Storm_Model_Loader {
class Class_ArticleCategorie extends Storm_Model_Abstract {
- use Trait_TreeViewableCategorie, Trait_TreeNode,Trait_PermissionTargetable, Trait_CustomFields;
+ use Trait_TreeViewableCategorie, Trait_TreeNode,Trait_PermissionTargetable, Trait_CustomFields {
+ Trait_TreeViewableCategorie::getParent insteadof Trait_TreeNode;
+ Trait_TreeViewableCategorie::getChildren insteadof Trait_TreeNode;
+ }
protected
diff --git a/library/Class/SitothequeCategorie.php b/library/Class/SitothequeCategorie.php
index bb9d1ba4967..e8ce28ed49f 100644
--- a/library/Class/SitothequeCategorie.php
+++ b/library/Class/SitothequeCategorie.php
@@ -19,8 +19,11 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
class Class_SitothequeCategorie extends Storm_Model_Abstract {
- use Trait_TreeViewableCategorie, Trait_Translator, Trait_TreeNode;
- use Trait_CustomFields;
+ use Trait_TreeViewableCategorie, Trait_Translator, Trait_TreeNode, Trait_CustomFields {
+ Trait_TreeViewableCategorie::getParent insteadof Trait_TreeNode;
+ Trait_TreeViewableCategorie::getChildren insteadof Trait_TreeNode;
+ }
+
protected $_table_name = 'sito_categorie';
protected $_table_primary = 'ID_CAT';
protected $_belongs_to = ['parent_categorie' => ['model' => 'Class_SitothequeCategorie',
diff --git a/library/Class/UserGroupCategorie.php b/library/Class/UserGroupCategorie.php
index 76f599b89fa..c402e5f1f0b 100644
--- a/library/Class/UserGroupCategorie.php
+++ b/library/Class/UserGroupCategorie.php
@@ -50,7 +50,10 @@ class UserGroupCategorieLoader extends Storm_Model_Loader{
class Class_UserGroupCategorie extends Storm_Model_Abstract {
- use Trait_TreeViewableCategorie, Trait_Translator, Trait_TreeNode;
+ use Trait_TreeViewableCategorie, Trait_Translator, Trait_TreeNode {
+ Trait_TreeViewableCategorie::getParent insteadof Trait_TreeNode;
+ Trait_TreeViewableCategorie::getChildren insteadof Trait_TreeNode;
+ }
protected
$_table_name = 'user_group_categorie',
--
GitLab