From 3fa2564adb87e9226e0a640a197e41909d6e2be7 Mon Sep 17 00:00:00 2001 From: Nicolas Date: Tue, 1 Mar 2022 16:47:52 +0100 Subject: [PATCH] [DigiriskElement] fix: change sql field rank by ranks because in mysql 8 rank is reserved --- class/digiriskelement.class.php | 6 +++--- core/modules/modDigiriskDolibarr.class.php | 2 +- lib/digiriskdolibarr_function.lib.php | 4 ++-- .../llx_digiriskdolibarr_digiriskelement.sql | 2 +- sql/update.sql | 3 ++- test/phpunit/DigiriskElementUnitTest.php | 6 +++--- view/digiriskelement/digiriskelement_organization.php | 4 ++-- 7 files changed, 14 insertions(+), 13 deletions(-) diff --git a/class/digiriskelement.class.php b/class/digiriskelement.class.php index ce562104e..3e3101da2 100644 --- a/class/digiriskelement.class.php +++ b/class/digiriskelement.class.php @@ -98,7 +98,7 @@ class DigiriskElement extends CommonObject 'fk_user_modif' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'UserModif', 'enabled' => '1', 'position' => 120, 'notnull' => -1, 'visible' => -2,), 'fk_parent' => array('type' => 'integer', 'label' => 'ParentElement', 'enabled' => '1', 'position' => 130, 'notnull' => 1, 'visible' => 1, 'default' => 0,), 'fk_standard' => array('type' => 'integer', 'label' => 'Standard', 'enabled' => '1', 'position' => 140, 'notnull' => 1, 'visible' => 0, 'default' => 1,), - 'rank' => array('type' => 'integer', 'label' => 'Order', 'enabled' => '1', 'position' => 150, 'notnull' => 1, 'visible' => 0), + 'ranks' => array('type' => 'integer', 'label' => 'Order', 'enabled' => '1', 'position' => 150, 'notnull' => 1, 'visible' => 0), ); public $rowid; @@ -117,7 +117,7 @@ class DigiriskElement extends CommonObject public $fk_user_modif; public $fk_parent; public $fk_standard; - public $rank; + public $ranks; /** * Constructor @@ -626,7 +626,7 @@ public function getNomUrl($withpicto = 0, $option = '', $addlabel = 0, $moreinpo */ public function getTrashList() { - $objects = $this->fetchAll('', 'rank'); + $objects = $this->fetchAll('', 'ranks'); if (is_array($objects)) { $recurse_tree = recurse_tree($this->id, 0, $objects); $ids = []; diff --git a/core/modules/modDigiriskDolibarr.class.php b/core/modules/modDigiriskDolibarr.class.php index 8c22341c6..041230dea 100644 --- a/core/modules/modDigiriskDolibarr.class.php +++ b/core/modules/modDigiriskDolibarr.class.php @@ -1287,7 +1287,7 @@ public function init($options = '') $digiriskelement->ref = $trashRef; $digiriskelement->label = $langs->trans('HiddenElements'); $digiriskelement->element_type = 'groupment'; - $digiriskelement->rank = 0; + $digiriskelement->ranks = 0; $digiriskelement->description = $langs->trans('TrashGroupment'); $digiriskelement->status = 0; $trash_id = $digiriskelement->create($user); diff --git a/lib/digiriskdolibarr_function.lib.php b/lib/digiriskdolibarr_function.lib.php index 035500a61..65ae72dc2 100644 --- a/lib/digiriskdolibarr_function.lib.php +++ b/lib/digiriskdolibarr_function.lib.php @@ -542,9 +542,9 @@ function digiriskHeader($title = '', $help_url = '', $arrayofjs = array(), $arra //Body navigation digirisk $object = new DigiriskElement($db); if ($conf->global->DIGIRISKDOLIBARR_SHOW_HIDDEN_DIGIRISKELEMENT) { - $objects = $object->fetchAll('', 'rank', 0, 0); + $objects = $object->fetchAll('', 'ranks', 0, 0); } else { - $objects = $object->fetchAll('', 'rank', 0, 0, array('customsql' => 'status > 0')); + $objects = $object->fetchAll('', 'ranks', 0, 0, array('customsql' => 'status > 0')); } $results = array(); diff --git a/sql/digiriskelement/llx_digiriskdolibarr_digiriskelement.sql b/sql/digiriskelement/llx_digiriskdolibarr_digiriskelement.sql index 2fab3d942..927cf6dc9 100644 --- a/sql/digiriskelement/llx_digiriskdolibarr_digiriskelement.sql +++ b/sql/digiriskelement/llx_digiriskdolibarr_digiriskelement.sql @@ -30,5 +30,5 @@ CREATE TABLE llx_digiriskdolibarr_digiriskelement( fk_user_modif integer, fk_parent integer DEFAULT 0 NOT NULL, fk_standard integer DEFAULT 1 NOT NULL, - `rank` integer + `ranks` integer ) ENGINE=innodb; diff --git a/sql/update.sql b/sql/update.sql index 6ca4ca112..c3d2be80f 100644 --- a/sql/update.sql +++ b/sql/update.sql @@ -52,4 +52,5 @@ ALTER TABLE llx_digiriskdolibarr_accident ADD accident_location text; ALTER TABLE llx_digiriskdolibarr_accident CHANGE `external_accident` `external_accident` SMALLINT(6) NULL DEFAULT '1'; -- ALTER TABLE llx_digiriskdolibarr_digiriskelement_extrafields ADD entity integer DEFAULT 1 NOT NULL; - +-- 9.1.0 +ALTER TABLE `llx_digiriskdolibarr_digiriskelement` CHANGE `rank` `ranks` INT(11) NULL DEFAULT NULL; diff --git a/test/phpunit/DigiriskElementUnitTest.php b/test/phpunit/DigiriskElementUnitTest.php index 6de6ac69f..399ea452d 100644 --- a/test/phpunit/DigiriskElementUnitTest.php +++ b/test/phpunit/DigiriskElementUnitTest.php @@ -159,7 +159,7 @@ public function testDigiriskElementCreate() $localobject->description = "TestDescriptionDigiriskElement"; $localobject->element_type = 'groupment'; $localobject->photo = 'test.png'; - $localobject->rank = 1; + $localobject->ranks = 1; $localobject->fk_user_creat = $user->id ? $user->id : 1; $localobject->fk_user_modif = $user->id ? $user->id : 1; $localobject->fk_parent = 0; @@ -259,7 +259,7 @@ public function testDigiriskElementUpdate($localobject) $localobject->description = "UpdatedTestDescriptionDigiriskElement"; $localobject->element_type = 'groupment'; $localobject->photo = 'newtest.png'; - $localobject->rank = 1; + $localobject->ranks = 1; $localobject->fk_user_creat = $user->id ? $user->id : 1; $localobject->fk_user_modif = $user->id ? $user->id : 1; $localobject->fk_parent = 0; @@ -286,7 +286,7 @@ public function testDigiriskElementUpdate($localobject) $this->assertSame($localobject->description, $newobject->description); $this->assertSame($localobject->element_type, $newobject->element_type); $this->assertSame($localobject->photo, $newobject->photo); - $this->assertSame($localobject->rank, $newobject->rank); + $this->assertSame($localobject->ranks, $newobject->ranks); $this->assertEquals($localobject->fk_user_creat, $newobject->fk_user_creat); $this->assertEquals($localobject->fk_user_modif, $newobject->fk_user_modif); $this->assertEquals($localobject->fk_parent, $newobject->fk_parent); diff --git a/view/digiriskelement/digiriskelement_organization.php b/view/digiriskelement/digiriskelement_organization.php index 7e89b3231..b00c711f1 100644 --- a/view/digiriskelement/digiriskelement_organization.php +++ b/view/digiriskelement/digiriskelement_organization.php @@ -104,7 +104,7 @@ foreach ($array_ids as $id) { $digiriskelement = new DigiriskElement($db); $digiriskelement->fetch((int) $id); - $digiriskelement->rank = $i + 1; + $digiriskelement->ranks = $i + 1; $digiriskelement->fk_parent = $array_parent_ids[$i]; $digiriskelement->update($user); @@ -138,7 +138,7 @@ ?>
fetchAll('', 'rank', 0, 0, array('customsql' => 'status > 0')); +$objects = $object->fetchAll('', 'ranks', 0, 0, array('customsql' => 'status > 0')); if (is_array($objects)) { $results = recurse_tree(0, 0, $objects); } else {