diff --git a/datamodels/2.x/itop-portal-base/_composer.json b/datamodels/2.x/itop-portal-base/_composer.json deleted file mode 100644 index 7af95a9a5..000000000 --- a/datamodels/2.x/itop-portal-base/_composer.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "require": { - "php": ">=5.6.0", - "symfony/symfony": "^3.4" - }, - "config": { - "vendor-dir": "../../../lib/composer-vendor", - "platform": { - "php": "5.6.0" - } - }, - "autoload": { - "psr-4": { - "Combodo\\iTop\\Portal\\": "portal/src/" - } - }, - "autoload-dev": { - "psr-4": { - "Combodo\\iTop\\Portal\\Tests\\": "tests/" - } - } -} \ No newline at end of file diff --git a/datamodels/2.x/itop-portal-base/model.itop-portal-base.php b/datamodels/2.x/itop-portal-base/model.itop-portal-base.php new file mode 100644 index 000000000..8b598ae3d --- /dev/null +++ b/datamodels/2.x/itop-portal-base/model.itop-portal-base.php @@ -0,0 +1,24 @@ + 'Portal Development Library', 'category' => 'Portal', @@ -13,10 +13,7 @@ SetupWebPage::AddModule( 'visible' => true, // Components 'datamodel' => array( -// 'portal/src/controllers/brickcontroller.class.inc.php', -// 'portal/src/entities/abstractbrick.class.inc.php', -// 'portal/src/entities/portalbrick.class.inc.php', -// 'portal/src/routers/abstractrouter.class.inc.php', + 'model.itop-portal-base.php', ), 'webservice' => array( //'webservices.itop-portal-base.php', diff --git a/datamodels/2.x/itop-portal/module.itop-portal.php b/datamodels/2.x/itop-portal/module.itop-portal.php index b8d948e83..99a58b41e 100644 --- a/datamodels/2.x/itop-portal/module.itop-portal.php +++ b/datamodels/2.x/itop-portal/module.itop-portal.php @@ -2,13 +2,13 @@ SetupWebPage::AddModule( __FILE__, // Path to the current file, all other file names are relative to the directory containing this file - 'itop-portal/2.6.1', array( + 'itop-portal/2.7.0', array( // Identification 'label' => 'Enhanced Customer Portal', 'category' => 'Portal', // Setup 'dependencies' => array( - 'itop-portal-base/1.0.0' + 'itop-portal-base/2.7.0' ), 'mandatory' => false, 'visible' => true,