composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-05-21 08:12:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into feature/dutch-dict

Browse Source
This commit is contained in:
Molkobain
2018-10-22 17:28:55 +02:00
committed by GitHub
parent 487e0c8769 cd5e1afb2b
commit fb07d19a64
165 changed files with 22962 additions and 9437 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
datamodels/2.x/itop-attachments/datamodel.itop-attachments.xml
View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.5">
<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.6">
<classes>
<class id="Attachment" _delta="define">
<parent>DBObject</parent>

2
datamodels/2.x/itop-backup/datamodel.itop-backup.xml
View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.5">
<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.6">
<menus>
<menu id="BackupStatus" xsi:type="WebPageMenuNode" _delta="define">
<rank>15</rank>

2
datamodels/2.x/itop-bridge-virtualization-storage/datamodel.itop-bridge-virtualization-storage.xml
View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.5">
<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.6">
<classes>
<class id="lnkVirtualDeviceToVolume" _delta="define">
<parent>cmdbAbstractObject</parent>

2
datamodels/2.x/itop-change-mgmt-itil/datamodel.itop-change-mgmt-itil.xml
View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.5">
<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.6">
<classes>
<class id="Change" _delta="define">
<parent>Ticket</parent>

2
datamodels/2.x/itop-change-mgmt/datamodel.itop-change-mgmt.xml
View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.5">
<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.6">
<classes>
<class id="Change" _delta="define">
<parent>Ticket</parent>

194
datamodels/2.x/itop-config-mgmt/data.sample.persons.xml
View File

File diff suppressed because one or more lines are too long

9
datamodels/2.x/itop-config-mgmt/datamodel.itop-config-mgmt.xml
View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.5">
<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.6">
<classes>
<class id="Organization" _delta="define">
<parent>cmdbAbstractObject</parent>
@@ -8423,5 +8423,12 @@
</cells>
</definition>
</menu>
<menu id="TagAdminMenu" xsi:type="WebPageMenuNode" _delta="define">
<rank>100</rank>
<parent>Catalogs</parent>
<url>$pages/tagadmin.php</url>
<enable_class>TagSetFieldData</enable_class>
<enable_action>UR_ACTION_MODIFY</enable_action>
</menu>
</menus>
</itop_design>

2
datamodels/2.x/itop-config/datamodel.itop-config.xml
View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.5">
<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.6">
<menus>
<menu id="ConfigEditor" xsi:type="WebPageMenuNode" _delta="define">
<rank>50</rank>

2
datamodels/2.x/itop-datacenter-mgmt/datamodel.itop-datacenter-mgmt.xml
View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.5">
<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.6">
<classes>
<class id="Rack" _delta="define">
<parent>PhysicalDevice</parent>

2
datamodels/2.x/itop-endusers-devices/datamodel.itop-enduser-devices.xml
View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.5">
<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.6">
<classes>
<class id="TelephonyCI" _delta="define">
<parent>PhysicalDevice</parent>

2
datamodels/2.x/itop-full-itil/datamodel.itop-full-itil.xml
View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.5">
<itop_design version="1.6">
<classes>
<class id="Ticket">
<methods>

2
datamodels/2.x/itop-hub-connector/datamodel.itop-hub-connector.xml
View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.5">
<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.6">
<constants>
</constants>
<classes>

2
datamodels/2.x/itop-hub-connector/js/hub.js
View File

@@ -138,7 +138,7 @@ $(function()
if (this.options.redirect_after_completion_url != '')
{
var sUrl = this.options.redirect_after_completion_url;
window.setTimeout(function() { window.location.href = sUrl; }, 500);
window.setTimeout(function() { window.location.href = sUrl; }, 3000);
}
}
else

2
datamodels/2.x/itop-incident-mgmt-itil/datamodel.itop-incident-mgmt-itil.xml
View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.5">
<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.6">
<constants>
<constant id="PORTAL_TYPE_TO_CLASS" xsi:type="string" _delta="redefine"><![CDATA[{"service_request":"UserRequest","incident":"Incident"}]]></constant>
<constant id="PORTAL_INCIDENT_PUBLIC_LOG" xsi:type="string" _delta="define"><![CDATA[public_log]]></constant>

23
datamodels/2.x/itop-knownerror-mgmt/data.sample.faq-domains.xml Normal file
View File

@@ -0,0 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
<Set>
<TagSetFieldDataFor_FAQ__domains id="1">
<code>software</code>
<label>Software 💾</label>
</TagSetFieldDataFor_FAQ__domains>
<TagSetFieldDataFor_FAQ__domains id="2">
<code>hardware</code>
<label>Hardware 💻</label>
</TagSetFieldDataFor_FAQ__domains>
<TagSetFieldDataFor_FAQ__domains id="3">
<code>server</code>
<label>Server 🏢</label>
</TagSetFieldDataFor_FAQ__domains>
<TagSetFieldDataFor_FAQ__domains id="4">
<code>mobile</code>
<label>Mobile 📱</label>
</TagSetFieldDataFor_FAQ__domains>
<TagSetFieldDataFor_FAQ__domains id="5">
<code>network</code>
<label>Network ☁️</label>
</TagSetFieldDataFor_FAQ__domains>
</Set>

19
datamodels/2.x/itop-knownerror-mgmt/datamodel.itop-knownerror-mgmt.xml
View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.5">
<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.6">
<classes>
<class id="KnownError" _delta="define">
<parent>cmdbAbstractObject</parent>
@@ -444,6 +444,12 @@
<default_value/>
<is_null_allowed>true</is_null_allowed>
</field>
<field id="domains" xsi:type="AttributeTagSet">
<sql>domains</sql>
<is_null_allowed>true</is_null_allowed>
<tracking_level>all</tracking_level>
<max_items>12</max_items>
</field>
</fields>
<methods/>
<presentation>
@@ -461,12 +467,15 @@
<item id="key_words">
<rank>40</rank>
</item>
<item id="summary">
<item id="domains">
<rank>50</rank>
</item>
<item id="description">
<item id="summary">
<rank>60</rank>
</item>
<item id="description">
<rank>70</rank>
</item>
</items>
</details>
<search>
@@ -483,7 +492,7 @@
<item id="error_code">
<rank>40</rank>
</item>
<item id="key_words">
<item id="domains">
<rank>50</rank>
</item>
</items>
@@ -496,7 +505,7 @@
<item id="error_code">
<rank>20</rank>
</item>
<item id="key_words">
<item id="domains">
<rank>30</rank>
</item>
</items>

1
datamodels/2.x/itop-knownerror-mgmt/en.dict.itop-knownerror-mgmt.php
View File

@@ -157,6 +157,7 @@ Dict::Add('EN US', 'English', 'English', array(
'Class:FAQ/Attribute:error_code+' => '',
'Class:FAQ/Attribute:key_words' => 'Key words',
'Class:FAQ/Attribute:key_words+' => '',
'Class:FAQ/Attribute:domains' => 'Domains',
));
//

1
datamodels/2.x/itop-knownerror-mgmt/fr.dict.itop-knownerror-mgmt.php
View File

@@ -129,6 +129,7 @@ Dict::Add('FR FR', 'French', 'Français', array(
'Class:FAQ/Attribute:error_code+' => '',
'Class:FAQ/Attribute:key_words' => 'Mots clés',
'Class:FAQ/Attribute:key_words+' => '',
'Class:FAQ/Attribute:domains' => 'Domaines',
));
//

2
datamodels/2.x/itop-knownerror-mgmt/module.itop-knownerror-mgmt.php
View File

@@ -29,7 +29,7 @@ SetupWebPage::AddModule(
//'data.struct.itop-knownerror-mgmt.xml',
),
'data.sample' => array(
//'data.sample.itop-knownerror-mgmt.xml',
'data.sample.faq-domains.xml',
),
// Documentation

15
datamodels/2.x/itop-portal-base/portal/src/forms/objectformmanager.class.inc.php
View File

@@ -32,7 +32,9 @@ use DBObjectSet;
use DBSearch;
use DBObjectSearch;
use InlineImage;
use ormTagSet;
use AttributeDateTime;
use AttributeTagSet;
use AttachmentPlugIn;
use Combodo\iTop\Form\FormManager;
use Combodo\iTop\Form\Form;
@@ -1120,7 +1122,18 @@ class ObjectFormManager extends FormManager
// Setting value in the object
$this->oObject->Set($sAttCode, $oLinkSet);
}
else if ($oAttDef instanceof AttributeDateTime) // AttributeDate is derived from AttributeDateTime
elseif ($oAttDef instanceof AttributeTagSet)
{
/** @var \ormTagSet $oTagSet */
$oTagSet = $this->oObject->Get($sAttCode);
if (is_null($oTagSet))
{
$oTagSet = new ormTagSet(get_class($this->oObject), $sAttCode);
}
$oTagSet->ApplyDelta(json_decode($value, true));
$this->oObject->Set($sAttCode, $oTagSet);
}
elseif ($oAttDef instanceof AttributeDateTime) // AttributeDate is derived from AttributeDateTime
{
if ($value != null)
{

8
datamodels/2.x/itop-portal-base/portal/src/helpers/applicationhelper.class.inc.php
View File

@@ -39,6 +39,7 @@ use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpKernel\Exception\HttpException;
use Twig_Environment;
use Twig_SimpleFilter;
use Twig_SimpleFunction;
use UserRights;
use utils;
@@ -269,6 +270,13 @@ class ApplicationHelper
return $sUrl;
}));
// Function to check our current environment
// Usage in twig : {% if is_development_environment() %}
$oTwigEnv->addFunction(new Twig_SimpleFunction('is_development_environment', function()
{
return utils::IsDevelopmentEnvironment();
}));
}
/**

12
datamodels/2.x/itop-portal-base/portal/src/views/layout.html.twig
View File

@@ -45,6 +45,7 @@
<link href="{{ app['combodo.absolute_url'] ~ 'css/font-awesome/css/font-awesome.min.css'|add_itop_version }}" rel="stylesheet">
{# - Misc libs #}
<link href="{{ app['combodo.portal.base.absolute_url'] ~ 'lib/typeahead/css/typeaheadjs.bootstrap.css'|add_itop_version }}" rel="stylesheet">
<link href="{{ app['combodo.absolute_url'] ~ 'css/selectize.default.css'|add_itop_version }}" rel="stylesheet">
<link href="{{ app['combodo.absolute_url'] ~ 'css/magnific-popup.css'|add_itop_version }}" rel="stylesheet">
<link href="{{ app['combodo.absolute_url'] ~ 'css/c3.min.css'|add_itop_version }}" rel="stylesheet">
{# - Bootstrap theme #}
@@ -80,11 +81,16 @@
{% block pPageScripts %}
<script type="text/javascript" src="{{ app['combodo.absolute_url'] ~ 'js/jquery-3.3.1.min.js'|add_itop_version }}"></script>
<script type="text/javascript" src="{{ app['combodo.absolute_url'] ~ 'js/jquery-migrate-3.0.1.min.js'|add_itop_version }}"></script>
{% if is_development_environment() %}
<script type="text/javascript" src="{{ app['combodo.absolute_url'] ~ 'js/jquery-migrate-3.0.1.dev.js'|add_itop_version }}"></script>
{% else %}
<script type="text/javascript" src="{{ app['combodo.absolute_url'] ~ 'js/jquery-migrate-3.0.1.prod.min.js'|add_itop_version }}"></script>
{% endif %}
<script type="text/javascript" src="{{ app['combodo.absolute_url'] ~ 'js/jquery-ui-1.11.4.custom.min.js'|add_itop_version }}"></script>
<script type="text/javascript" src="{{ app['combodo.absolute_url'] ~ 'js/jquery.magnific-popup.min.js'|add_itop_version }}"></script>
<script type="text/javascript" src="{{ app['combodo.absolute_url'] ~ 'js/jquery.iframe-transport.js'|add_itop_version }}"></script>
<script type="text/javascript" src="{{ app['combodo.absolute_url'] ~ 'js/jquery.fileupload.js'|add_itop_version }}"></script>
<script type="text/javascript" src="{{ app['combodo.absolute_url'] ~ 'js/utils.js'|add_itop_version }}"></script>
<script type="text/javascript" src="{{ app['combodo.absolute_url'] ~ 'js/d3.min.js'|add_itop_version }}"></script>
<script type="text/javascript" src="{{ app['combodo.absolute_url'] ~ 'js/c3.min.js'|add_itop_version }}"></script>
<script type="text/javascript" src="{{ app['combodo.portal.base.absolute_url'] ~ 'lib/bootstrap/js/bootstrap.min.js'|add_itop_version }}"></script>
@@ -114,6 +120,9 @@
{# Typeahead files for autocomplete #}
<script type="text/javascript" src="{{ app['combodo.portal.base.absolute_url'] ~ 'lib/typeahead/js/typeahead.bundle.min.js'|add_itop_version }}"></script>
<script type="text/javascript" src="{{ app['combodo.portal.base.absolute_url'] ~ 'lib/handlebars/js/handlebars.min-768ddbd.js'|add_itop_version }}"></script>
{# Selectize for sets #}
<script type="text/javascript" src="{{ app['combodo.absolute_url'] ~ 'js/selectize.js'|add_itop_version }}"></script>
<script type="text/javascript" src="{{ app['combodo.absolute_url'] ~ 'js/jquery.itop-set-widget.js'|add_itop_version }}"></script>
{# Form files #}
<script type="text/javascript" src="{{ app['combodo.absolute_url'] ~ 'js/form_handler.js'|add_itop_version }}"></script>
<script type="text/javascript" src="{{ app['combodo.absolute_url'] ~ 'js/form_field.js'|add_itop_version }}"></script>
@@ -123,6 +132,7 @@
<script type="text/javascript" src="{{ app['combodo.portal.base.absolute_url'] ~ 'js/portal_form_handler.js'|add_itop_version }}"></script>
<script type="text/javascript" src="{{ app['combodo.portal.base.absolute_url'] ~ 'js/portal_form_field.js'|add_itop_version }}"></script>
<script type="text/javascript" src="{{ app['combodo.portal.base.absolute_url'] ~ 'js/portal_form_field_html.js'|add_itop_version }}"></script>
<script type="text/javascript" src="{{ app['combodo.portal.base.absolute_url'] ~ 'js/portal_form_field_set.js'|add_itop_version }}"></script>
{# UI Extensions JS, in an undefined order #}
{% if app['combodo.portal.instance.conf'].ui_extensions.js_files is defined %}
{% for js_file in app['combodo.portal.instance.conf'].ui_extensions.js_files %}

39
datamodels/2.x/itop-portal-base/portal/web/css/bootstrap-theme-combodo.css vendored
View File

@@ -3213,19 +3213,20 @@ textarea.input-group-sm > .form-control, textarea.input-group-sm > .input-group-
cursor: not-allowed;
}
.label {
display: inline;
display: inline-block;
padding: 0.2em 0.6em 0.3em;
font-size: 75%;
font-weight: bold;
line-height: 1;
color: #fff;
color: #222;
background-color: #fff;
text-align: center;
white-space: nowrap;
vertical-align: baseline;
border-radius: 0.25em;
border-radius: 0px;
box-shadow: 0 1px 1px rgba(0, 0, 0, 0.15), 0 0 1px 1px #f1f1f1;
}
a.label:hover, a.label:focus {
color: #fff;
color: #222;
text-decoration: none;
cursor: pointer;
}
@@ -3237,10 +3238,11 @@ a.label:hover, a.label:focus {
top: -1px;
}
.label-default {
background-color: #474949;
color: #222;
background-color: #fff;
}
.label-default[href]:hover, .label-default[href]:focus {
background-color: #2e2f2f;
background-color: #f9f9f9;
}
.label-primary {
background-color: #ea7d1e;
@@ -5044,3 +5046,26 @@ table.dataTable tbody tr.selected a, table.dataTable tbody th.selected a, table.
color: #444;
background-color: #fcfcfc;
}
/* Temp */
.label {
margin-right: 0.4em;
margin-bottom: 0.4em;
padding: 0.5em 0.7em 0.5em;
font-size: 85%;
font-weight: normal;
box-shadow: 0 1px 1px rgba(0, 0, 0, 0.15), 0 0 1px 1px #f1f1f1;
}
.label:last-of-type {
margin-right: 0;
}
.selectize-control.multi .selectize-input .attribute-set-item[data-value] {
border-radius: 0;
background-color: #fff;
background-image: none;
border: none;
text-shadow: none;
color: black;
}
.selectize-control.multi .selectize-input .attribute-set-item[data-value] .remove {
border-left: none;
}

49
datamodels/2.x/itop-portal-base/portal/web/css/bootstrap-theme-combodo.scss vendored
View File

@@ -4017,20 +4017,21 @@ fieldset[disabled] .navbar-inverse .btn-link:focus {
cursor: not-allowed
}
.label {
display: inline;
display: inline-block;
padding: .2em .6em .3em;
font-size: 75%;
font-weight: bold;
line-height: 1;
color: #ffffff;
color: $label-default-color;
background-color: $label-default-bg;
text-align: center;
white-space: nowrap;
vertical-align: baseline;
border-radius: .25em
border-radius: $label-border-radius;
box-shadow: 0 1px 1px rgba(0, 0, 0, 0.15), 0 0 1px 1px #f1f1f1;
}
a.label:hover,
a.label:focus {
color: #ffffff;
color: $label-default-color;
text-decoration: none;
cursor: pointer
}
@@ -4042,11 +4043,12 @@ a.label:focus {
top: -1px
}
.label-default {
background-color: #474949
color: $label-default-color;
background-color: $label-default-bg;
}
.label-default[href]:hover,
.label-default[href]:focus {
background-color: #2e2f2f
background-color: darken($label-default-bg, 2.5%);
}
.label-primary {
background-color: $brand-primary
@@ -6163,3 +6165,36 @@ table.dataTable{
}
}
}
/* Temp */
.label{
margin-right: 0.4em;
margin-bottom: 0.4em;
padding: 0.5em 0.7em 0.5em;
font-size: 90%;
font-weight: normal;
//color: $white;
box-shadow: 0 1px 1px rgba(0, 0, 0, 0.15), 0 0 1px 1px #f1f1f1;
&:last-of-type{
margin-right: 0;
}
}
.selectize-control.multi .selectize-input .attribute-set-item[data-value]{
border-radius: 0;
background-color: $white;
background-image: none;
border: none;
box-shadow: 0 1px 1px rgba(0, 0, 0, 0.15), 0 0 1px 1px #f1f1f1;
text-shadow: none;
color: black;
.remove{
border-left: none;
}
}

17
datamodels/2.x/itop-portal-base/portal/web/css/variables.scss
View File

@@ -602,19 +602,26 @@ $popover-arrow-outer-fallback-color: darken($popover-fallback-border-color, 20%
//== Labels
//
//##
$label-border-radius: $border-radius-base !default;
//** Default label background color
$label-default-color: $btn-default-color !default;
$label-default-bg: $btn-default-bg !default;
//** Primary label background color
$label-primary-bg: $brand-primary !default;
$label-primary-color: $btn-primary-color !default;
$label-primary-bg: $btn-primary-bg !default;
//** Success label background color
$label-success-bg: $brand-success !default;
$label-success-color: $btn-success-color !default;
$label-success-bg: $btn-success-bg !default;
//** Info label background color
$label-info-bg: $brand-info !default;
$label-info-color: $btn-info-color !default;
$label-info-bg: $btn-info-bg !default;
//** Warning label background color
$label-warning-bg: $brand-warning !default;
$label-warning-color: $btn-warning-color !default;
$label-warning-bg: $btn-warning-bg !default;
//** Danger label background color
$label-danger-bg: $brand-danger !default;
$label-danger-color: $btn-danger-color !default;
$label-danger-bg: $btn-danger-bg !default;
//** Default label text color
$label-color: #fff !default;

55
datamodels/2.x/itop-portal-base/portal/web/js/portal_form_field_set.js Normal file
View File

@@ -0,0 +1,55 @@
//iTop Portal Form field Set
//Used for field containing tagset ...
;
$(function()
{
// the widget definition, where 'itop' is the namespace,
// 'portal_form_field' the widget name
$.widget( 'itop.portal_form_field_set', $.itop.portal_form_field,
{
// the constructor
_create: function()
{
this.element
.addClass('portal_form_field_tagset');
this.element.find('input[type="hidden"]').set_widget();
this._super();
},
// events bound via _bind are removed automatically
// revert other modifications here
_destroy: function()
{
this.element
.removeClass('portal_form_field_tagset');
this._super();
},
// _setOptions is called with a hash of all options that are changing
// always refresh when changing options
_setOptions: function()
{
this._superApply(arguments);
},
// _setOption is called for each individual option that is changing
_setOption: function( key, value )
{
this._super( key, value );
},
validate: function(oEvent, oData)
{
var oResult = { is_valid: true, error_messages: [] };
// Doing data validation
if(this.options.validators !== null)
{
// TODO
}
this.options.on_validation_callback(this, oResult);
return oResult;
}
});
});

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

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.5">
<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] -->

2
datamodels/2.x/itop-problem-mgmt/datamodel.itop-problem-mgmt.xml
View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.5">
<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.6">
<classes>
<class id="Problem" _delta="define">
<parent>Ticket</parent>

3
datamodels/2.x/itop-profiles-itil/datamodel.itop-profiles-itil.xml
View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.5">
<itop_design version="1.6">
<classes/>
<user_rights>
<groups>
@@ -27,6 +27,7 @@
<class id="Typology"/>
<class id="NASFileSystem"/>
<class id="LogicalVolume"/>
<class id="TagSetFieldData"/>
<class id="Tape"/>
<class id="VLAN"/>
</classes>

2
datamodels/2.x/itop-request-mgmt-itil/datamodel.itop-request-mgmt-itil.xml
View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.5">
<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.6">
<constants>
<constant id="PORTAL_TYPE_TO_CLASS" xsi:type="string" _delta="redefine"><![CDATA[{"service_request":"UserRequest","incident":"Incident"}]]></constant>
<constant id="PORTAL_USERREQUEST_PUBLIC_LOG" xsi:type="string" _delta="define"><![CDATA[public_log]]></constant>

3395
datamodels/2.x/itop-request-mgmt/datamodel.itop-request-mgmt.xml
View File

File diff suppressed because it is too large Load Diff

2
datamodels/2.x/itop-service-mgmt-provider/datamodel.itop-service-mgmt-provider.xml
View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.5">
<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.6">
<classes>
<class id="Organization">
<fields>

2
datamodels/2.x/itop-service-mgmt/datamodel.itop-service-mgmt.xml
View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.5">
<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.6">
<classes>
<class id="Organization">
<fields>

2
datamodels/2.x/itop-storage-mgmt/datamodel.itop-storage-mgmt.xml
View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.5">
<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.6">
<classes>
<class id="StorageSystem" _delta="define">
<parent>DatacenterDevice</parent>

5
datamodels/2.x/itop-tickets/datamodel.itop-tickets.xml
View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.5">
<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.6">
<constants>
<constant id="RESPONSE_TICKET_SLT_QUERY" xsi:type="string" _delta="define"><![CDATA[SELECT SLT AS slt JOIN lnkSLAToSLT AS l1 ON l1.slt_id=slt.id JOIN SLA AS sla ON l1.sla_id=sla.id JOIN lnkCustomerContractToService AS l2 ON l2.sla_id=sla.id JOIN CustomerContract AS sc ON l2.customercontract_id=sc.id WHERE slt.metric = :metric AND l2.service_id = :this->service_id AND sc.org_id = :this->org_id AND slt.request_type = :request_type AND slt.priority = :this->priority]]></constant>
<constant id="PORTAL_POWER_USER_PROFILE" xsi:type="string" _delta="define"><![CDATA[Portal power user]]></constant>
@@ -196,9 +196,6 @@
<count_min>0</count_min>
<count_max>0</count_max>
</field>
<field id="tagfield" xsi:type="AttributeTagSet">
<sql>tagfield</sql>
</field>
</fields>
<methods>
<method id="DBInsertNoReload">

2
datamodels/2.x/itop-tickets/en.dict.itop-tickets.php
View File

@@ -74,7 +74,7 @@ Dict::Add('EN US', 'English', 'English', array(
'Class:Ticket/Attribute:close_date+' => '',
'Class:Ticket/Attribute:private_log' => 'Private log',
'Class:Ticket/Attribute:private_log+' => '',
'Class:Ticket/Attribute:contacts_list' => 'Contacts',
'Class:Ticket/Attribute:contacts_list' => 'Contacts',
'Class:Ticket/Attribute:contacts_list+' => 'All the contacts linked to this ticket',
'Class:Ticket/Attribute:functionalcis_list' => 'CIs',
'Class:Ticket/Attribute:functionalcis_list+' => 'All the configuration items impacted by this ticket. Items marked as "Computed" have been automatically marked as impacted. Items marked as "Not impacted" are excluded from the impact.',

2
datamodels/2.x/itop-tickets/fr.dict.itop-tickets.php
View File

@@ -63,7 +63,7 @@ Dict::Add('FR FR', 'French', 'Français', array(
'Class:Ticket/Attribute:private_log+' => '',
'Class:Ticket/Attribute:contacts_list' => 'Contacts',
'Class:Ticket/Attribute:contacts_list+' => '',
'Class:Ticket/Attribute:functionalcis_list' => 'CIs',
'Class:Ticket/Attribute:functionalcis_list' => 'CIs',
'Class:Ticket/Attribute:functionalcis_list+' => 'Tous les éléments de configuration impactés par ce ticket. Les éléments marqués comme "Calculés" sont le résultat du calcul de l\'analyse d\'impact. Les éléments marqués comme "Non impactés" sont exclus de cette analyse.',
'Class:Ticket/Attribute:workorders_list' => 'Tâches',
'Class:Ticket/Attribute:workorders_list+' => '',

2
datamodels/2.x/itop-virtualization-mgmt/datamodel.itop-virtualization-mgmt.xml
View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.5">
<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.6">
<classes>
<class id="VirtualDevice" _delta="define">
<parent>FunctionalCI</parent>

2
datamodels/2.x/itop-welcome-itil/datamodel.itop-welcome-itil.xml
View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.5">
<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.6">
<classes>
<class id="AbstractResource" _delta="define">
<parent>cmdbAbstractObject</parent>