Skip to content

Commit

Permalink
Suppression support lizmap 3.5
Browse files Browse the repository at this point in the history
  • Loading branch information
@laurentj
laurentj committed Feb 13, 2024
1 parent 617554f commit 9b4ae89
Show file tree
Hide file tree
Showing 15 changed files with 40 additions and 238 deletions.
13 changes: 13 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,19 @@

## Unreleased

## 2.17.0 - 2024-02-14

* compatibilité des modules avec Lizmap 3.6 uniquement. Abandon du
support lizmap 3.5 dans les versions 2.17 et plus.

## 2.16.8 - 2024-02-13

### Backend

* PHP - annulation remplacement des fonctions dépréciées. Les versions 2.16
doivent rester compatible Lizmap 3.5


## 2.16.7 - 2024-02-13

### Backend
Expand Down
25 changes: 2 additions & 23 deletions composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"type": "jelix-module",
"description": "Jelix module to manage data on species observations for Lizmap.",
"keywords": ["module", "jelix", "lizmap", "naturaliz"],
"homepage": "http://3liz.com",
"homepage": "https://www.3liz.com",
"license": "MPL-2.0",
"authors": [
{
Expand All @@ -29,28 +29,7 @@
"occtax/",
"occtax_admin/",
"gestion/"
],
"autoconfig-access-16" : {
"[email protected]" : {
"taxon": {
"__global": 1,
"index" : 2
},
"occtax": {
"__global": 1,
"index" : 2,
"script": 2
},
"gestion": {
"__global": 1,
"index" : 2
},
"occtax_admin": {
"__global": 1,
"admin" : 2
}
}
}
]
}
}
}
14 changes: 4 additions & 10 deletions doc/INSTALL.md
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
# Installation des modules Naturaliz pour Lizmap

Pour pouvoir installer l'application Naturaliz, vous devez au préalable avoir installé un serveur cartographique basé sur Lizmap.
Vous pouvez pour cela utiliser les script de déploiement automatique **lizmap-box** pour cela. Nous considérons dans la suite de
Vous pouvez pour cela utiliser les scripts de déploiement automatique **lizmap-box** pour cela. Nous considérons dans la suite de
ce document que Lizmap Web Client a été installé et est fonctionnel.

Il faut au minimum Lizmap 3.4.
Il faut au minimum Lizmap 3.6.

> Attention: Pour que la recherche plein texte dans taxons fonctionne correctement, il est important de vérifier que la variable locale $LANG est bien spécifiée à fr_FR.UTF-8 avant l'installation de PostgreSQL. On peut par exemple ajouter cette ligne dans le fichier /etc/profile ```: ${LANG:=fr_FR.UTF-8}; export LANG``` et se déconnecter puis reconnecter, ou on peut exporter manuellement la variable.
Expand Down Expand Up @@ -51,7 +51,7 @@ composer require "lizmap/naturaliz-modules"

### Lancer le configurateur

Si vous utilisez Lizmap 3.6 ou plus, lancez les commandes
Lancez les commandes

```bash
cd lizmap/install/
Expand All @@ -61,12 +61,6 @@ php configurator.php gestion
php configurator.php occtax_admin
```

Sinon, pour Lizmap 3.4 ou 3.5, lancez les commandes

```bash
cp lizmap/lizmap-modules/occtax/install/config/naturaliz.ini.php.dist lizmap/var/config/naturaliz.ini.php
```


### Adapter les fichiers de configuration pour Lizmap

Expand Down Expand Up @@ -476,7 +470,7 @@ comme décrit précédemment.

### Import TAXREF : données officielles des taxons

Pour pouvoir effectuer des recherche via le module taxon, vous devez au
Pour pouvoir effectuer des recherches via le module taxon, vous devez au
préalable récupérer les données officielles du TAXREF, puis les importer.

Les fichiers concernant TAXREF, les menaces (listes rouges) et les protections sont téléchargés directement depuis la plateforme SINP (site du MNHN)
Expand Down
22 changes: 0 additions & 22 deletions gestion/install/install_1_6.php
View file

This file was deleted.

2 changes: 1 addition & 1 deletion gestion/module.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<homepageURL>http://3liz.com</homepageURL>
</info>
<dependencies>
<module name="lizmap" minversion="3.4.0" maxversion="3.6.*"/>
<module name="lizmap" minversion="3.6.0" maxversion="3.6.*"/>
<module name="view" />
<module name="taxon" />
<module name="occtax" />
Expand Down
21 changes: 7 additions & 14 deletions occtax/install/install.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,32 +5,25 @@
* @subpackage occtax
* @author Michaël Douchin
* @contributor Laurent Jouanneau
* @copyright 2014-2022 3liz
* @copyright 2014-2024 3liz
* @link http://3liz.com
* @license All rights reserved
*/
require_once(__DIR__.'/installTrait.php');

// class occtaxModuleInstaller extends \Jelix\Installer\Module\Installer
class occtaxModuleInstaller extends jInstallerModule
class occtaxModuleInstaller extends \Jelix\Installer\Module\Installer
{
use installTrait;

// public function install(\Jelix\Installer\Module\API\InstallHelpers $helpers)
public function install()
public function install(\Jelix\Installer\Module\API\InstallHelpers $helpers)
{
// Install database structure
$sqlDirPath = $this->path.'install/sql/';
$db = $this->dbConnection();
// LWC >= 3.6
// $sqlDirPath = $this->getPath() . 'install/sql/';
// $db = $helpers->database()->dbConnection()
$sqlDirPath = $this->getPath() . 'install/sql/';
$db = $helpers->database()->dbConnection();
$this->setupOcctaxDatabase($db, $sqlDirPath);

// Add data for lists
$this->execSQLScript('sql/data');
// LWC >= 3.6
// $helpers->database()->execSQLScript('sql/data');
$helpers->database()->execSQLScript('sql/data');

// Setup groups and rights
$this->setupOcctaxRights();
Expand All @@ -39,6 +32,6 @@ public function install()
// We use overwrite to be sure the new versions of the JS files
// will be used
$overwrite = true;
$this->copyDirectoryContent('www', jApp::wwwPath(), $overwrite);
$helpers->copyDirectoryContent('www', jApp::wwwPath(), $overwrite);
}
}
2 changes: 1 addition & 1 deletion occtax/install/installTrait.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ protected function setupOcctaxDatabase($db, $sqlPath)

// Get SRID
$localConfig = jApp::varConfigPath('naturaliz.ini.php');
$ini = new Jelix\IniFile\IniModifier($localConfig);
$ini = new \Jelix\IniFile\IniModifier($localConfig);
$srid = $this->getParameter('srid');
if(empty($srid)){
$srid = $ini->getValue('srid', 'naturaliz');
Expand Down
56 changes: 0 additions & 56 deletions occtax/install/install_1_6.php
View file

This file was deleted.

8 changes: 4 additions & 4 deletions occtax/install/upgrade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,20 +4,20 @@
* @package lizmap
* @subpackage occtax
* @author 3liz
* @copyright 2011-2019 3liz
* @copyright 2011-2024 3liz
* @link http://3liz.com
* @license Mozilla Public License : http://www.mozilla.org/MPL/
*/

class occtaxModuleUpgrader extends jInstallerModule
class occtaxModuleUpgrader extends \Jelix\Installer\Module\Installer
{

function install()
public function install(\Jelix\Installer\Module\API\InstallHelpers $helpers)
{
// Copy CSS and JS assets
// We use overwrite to be sure the new versions of the JS files
// will be used
$overwrite = true;
$this->copyDirectoryContent('www', jApp::wwwPath(), $overwrite);
$helpers->copyDirectoryContent('www', jApp::wwwPath(), $overwrite);
}
}
2 changes: 1 addition & 1 deletion occtax/module.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<homepageURL>http://3liz.com</homepageURL>
</info>
<dependencies>
<module name="lizmap" minversion="3.4.0" maxversion="3.6.*"/>
<module name="lizmap" minversion="3.6.0" maxversion="3.6.*"/>
<module name="view" />
<module name="taxon" />
</dependencies>
Expand Down
38 changes: 0 additions & 38 deletions occtax_admin/install/install_1_6.php
View file

This file was deleted.

2 changes: 1 addition & 1 deletion occtax_admin/module.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<homepageURL>http://3liz.com</homepageURL>
</info>
<dependencies>
<module name="lizmap" minversion="3.4.0" maxversion="3.6.*"/>
<module name="lizmap" minversion="3.6.0" maxversion="3.6.*"/>
<module name="view" />
<module name="taxon" />
<module name="occtax" />
Expand Down
60 changes: 0 additions & 60 deletions taxon/install/install_1_6.php
View file

This file was deleted.

Loading

0 comments on commit 9b4ae89

Please sign in to comment.