composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-05-20 15:52:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into feature/b931

Browse Source 
# Conflicts:
#	application/applicationextension.inc.php
#	core/attributedef.class.inc.php
#	core/cmdbchangeop.class.inc.php
#	core/cmdbobject.class.inc.php
#	core/dbobjectsearch.class.php
#	core/oql/expression.class.inc.php
#	core/oql/oql-lexer.plex
#	core/oql/oql-parser.y
#	core/oql/oqlquery.class.inc.php
#	css/light-grey.scss
#	datamodels/2.x/itop-full-itil/datamodel.itop-full-itil.xml
#	datamodels/2.x/itop-portal/datamodel.itop-portal.xml
#	datamodels/2.x/itop-tickets/en.dict.itop-tickets.php
#	dictionaries/en.dictionary.itop.core.php
#	dictionaries/fr.dictionary.itop.core.php
#	setup/xmldataloader.class.inc.php
#	test/ItopDataTestCase.php
This commit is contained in:
Pierre Goiffon
2018-09-04 18:02:07 +02:00
parent 98e5eaa4e0 40a4e6d7b0
commit f871581997
385 changed files with 145807 additions and 145632 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
datamodels/2.x/itop-portal/datamodel.itop-portal.xml
View File

@@ -1,14 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.6">
<portals>
<portal id="legacy_portal" _delta="delete" /> <!-- TODO: voir si opportun de renommer au lieu de delete+define -->
<portal id="itop-portal" _delta="define"><!-- ID must match module_design[id] -->
<url>pages/exec.php?exec_module=itop-portal-base&amp;exec_page=index.php&amp;portal_id=itop-portal</url><!-- portal_id must match module_design[id] -->
<rank>1.0</rank>
<handler />
<allow>
</allow>
<deny />
</portal>
</portals>
</itop_design>
<?xml version="1.0" encoding="UTF-8"?>
<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.6">
<portals>
<portal id="legacy_portal" _delta="delete" /> <!-- TODO: voir si opportun de renommer au lieu de delete+define -->
<portal id="itop-portal" _delta="define"><!-- ID must match module_design[id] -->
<url>pages/exec.php?exec_module=itop-portal-base&amp;exec_page=index.php&amp;portal_id=itop-portal</url><!-- portal_id must match module_design[id] -->
<rank>1.0</rank>
<handler />
<allow>
</allow>
<deny />
</portal>
</portals>
</itop_design>

74
datamodels/2.x/itop-portal/module.itop-portal.php
View File

@@ -1,37 +1,37 @@
<?php
SetupWebPage::AddModule(
__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
'itop-portal/2.5.0', array(
// Identification
'label' => 'Enhanced Customer Portal',
'category' => 'Portal',
// Setup
'dependencies' => array(
'itop-portal-base/1.0.0'
),
'mandatory' => false,
'visible' => true,
// Components
'datamodel' => array(
'main.itop-portal.php'
),
'webservice' => array(
//'webservices.itop-portal.php',
),
'dictionary' => array(
),
'data.struct' => array(
//'data.struct.itop-portal.xml',
),
'data.sample' => array(
//'data.sample.itop-portal.xml',
),
// Documentation
'doc.manual_setup' => '',
'doc.more_information' => '',
// Default settings
'settings' => array(
),
)
);
<?php
SetupWebPage::AddModule(
__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
'itop-portal/2.5.0', array(
// Identification
'label' => 'Enhanced Customer Portal',
'category' => 'Portal',
// Setup
'dependencies' => array(
'itop-portal-base/1.0.0'
),
'mandatory' => false,
'visible' => true,
// Components
'datamodel' => array(
'main.itop-portal.php'
),
'webservice' => array(
//'webservices.itop-portal.php',
),
'dictionary' => array(
),
'data.struct' => array(
//'data.struct.itop-portal.xml',
),
'data.sample' => array(
//'data.sample.itop-portal.xml',
),
// Documentation
'doc.manual_setup' => '',
'doc.more_information' => '',
// Default settings
'settings' => array(
),
)
);