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 remote-tracking branch 'origin/support/3.2' into develop

Browse Source
This commit is contained in:
Eric Espie
2024-05-24 10:18:48 +02:00
parent a698aec7a5 094a9ed82f
commit c31443cb79
96 changed files with 16432 additions and 675 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1257,7 +1257,7 @@
$this->Set('team_id', $oParentTicket->Get('team_id'));
$this->Set('agent_id', $oParentTicket->Get('agent_id'));
}
$sParent = '[['.get_class($oParentTicket).':'.$oParentTicket->Get('ref').']]';
$sParent = '[['.get_class($oParentTicket).':'.$oParentTicket->GetKey().'|'.$oParentTicket->Get('ref').']]';
$this->Set('solution', Dict::Format('Tickets:ResolvedFrom', $sParent, MetaModel::GetName(get_class($oParentTicket))));
$this->ApplyStimulus('ev_autoresolve');
$this->DBUpdate();

2
datamodels/2.x/itop-portal-base/portal/public/css/portal.css
View File

File diff suppressed because one or more lines are too long

84
datamodels/2.x/itop-portal-base/portal/public/css/portal.scss
View File

@@ -1309,6 +1309,7 @@ table .group-actions .item-action-wrapper .panel-body > p:last-child{
.caselog-thread--block-entry-content{
display: block;
overflow-x: auto;
overflow-y: hidden;
> p:last-of-type{
margin-bottom: 0px;
@@ -1729,67 +1730,50 @@ table .group-actions .item-action-wrapper .panel-body > p:last-child{
}
}
/* CKEditor : Adding BS error feedback */
/* CKEditor: Variables overload */
.ck {
--ck-color-focus-border: #{$brand-primary};
--ck-spacing-small: 4px;
--ck-ui-component-min-height: 18px;
--ck-icon-size: 18px;
}
/* CKEditor: Adding BS error feedback */
.form_field .cke{
border: 1px solid $gray-lighter;
}
.form_field.has-error .cke{
.form_field.has-error .ck-editor{
border: 1px solid $state-danger-text;
border-radius: $border-radius-base;
box-shadow: inset 0 1px 1px rgba(0,0,0,0.075);
}
/* CKEditor : Styling notifications based on BS alerts */
.cke_notification{
position: relative;
padding: 15px;
margin-bottom: 18px;
border: 1px solid transparent;
border-radius: 4px;
background-color: $white
}
.cke_notification_close{
position: absolute;
top: 2px;
right: 5px;
}
.cke_notification_message{
margin-bottom: 0px;
line-height: 1em;
font-size: 1em;
}
.cke_notification_success{
display: none;
background-color: $alert-success-bg;
border-color: $alert-success-border;
color: $alert-success-text;
}
.cke_notification_warning{
background-color: $alert-warning-bg;
border-color: $alert-warning-border;
color: $alert-warning-text;
}
/* CKEditor : Misc */
.cke_toolbox_collapser,
.cke_toolbox_collapser .cke_arrow{
cursor: pointer !important;
}
.cke_toolbox_collapser.cke_toolbox_collapser_min ~ .editor-fullscreen-button {
display: block;
width: 12px;
height: 11px;
border: 1px solid $gray-lighter;
cursor: pointer;
/* CKEditor: Fullscreen */
.ck {
&.cke-maximized {
position: fixed !important; /* !important to overload the inline style */
z-index: 1060; /* Above modals z-index (1050), see bootstrap theme */
top: 0;
left: 0;
width: 100% !important; /* !important to overload the inline style */
height: 100% !important; /* !important to overload the inline style */
display: flex;
flex-direction: column;
justify-content: flex-start;
/* !important so it overrides the .cke_reset_all style */
background-position: center center !important;
background-repeat: no-repeat !important;
background-size: 100% !important;
background-image: url('../../../../../images/full-screen.png') !important;
/* Force text content to take all space available (and scroll when content overflows) */
.ck-editor__main {
flex-grow: 1;
overflow-y: auto;
&:hover {
background-color: #E5E5E5;
.ck-content {
height: 100%; /* To force content to occupy whole height, otherwise it fits its content */
}
}
}
}
/* - Avoid page scrollbar on fullscreen */
body.cke-maximized {
overflow: hidden;
}
/* DataTables : Selection inputs */
.dataTable.table th span.row_input,

6
datamodels/2.x/itop-portal-base/portal/templates/layout.html.twig
View File

@@ -50,7 +50,7 @@
<link href="{{ app['combodo.absolute_url'] ~ 'css/selectize.default.css'|add_itop_version }}" rel="stylesheet">
<link href="{{ app['combodo.absolute_url'] ~ 'node_modules/magnific-popup/dist/magnific-popup.css'|add_itop_version }}" rel="stylesheet">
<link href="{{ app['combodo.absolute_url'] ~ 'node_modules/c3/c3.min.css'|add_itop_version }}" rel="stylesheet">
<link href="{{ app['combodo.absolute_url'] ~ 'js/ckeditor/plugins/codesnippet/lib/highlight/styles/obsidian.css'|add_itop_version }}" rel="stylesheet">
<link href="{{ app['combodo.absolute_url'] ~ 'js/highlight/styles/obsidian.min.css'|add_itop_version }}" rel="stylesheet">
{# - Bootstrap theme #}
<link href="{{ app['combodo.absolute_url'] ~ app['combodo.portal.instance.conf'].properties.themes.bootstrap|add_itop_version }}" rel="stylesheet" id="css_bootstrap_theme">
{# - Portal adjustments for BS theme #}
@@ -130,8 +130,8 @@
<script type="text/javascript" src="{{ app['combodo.absolute_url'] ~ 'js/ckeditor/adapters/jquery.js'|add_itop_version }}"></script>
<script type="text/javascript" src="{{ app['combodo.absolute_url'] ~ 'js/ckeditor.handler.js'|add_itop_version }}"></script>
<script type="text/javascript" src="{{ app['combodo.absolute_url'] ~ 'js/ckeditor.feeds.js'|add_itop_version }}"></script>
{# - Hilighter for code snippets created with CKEditor #}
<script type="text/javascript" src="{{ app['combodo.absolute_url'] ~ 'js/ckeditor/plugins/codesnippet/lib/highlight/highlight.pack.js'|add_itop_version }}"></script>
{# - Highlighter for code snippets created with CKEditor #}
<script type="text/javascript" src="{{ app['combodo.absolute_url'] ~ 'js/highlight/highlight.min.js'|add_itop_version }}"></script>
{# Date-time picker for Bootstrap #}
<script type="text/javascript" src="{{ app['combodo.portal.base.absolute_url'] ~ 'lib/bootstrap-datetimepicker/js/bootstrap-datetimepicker.min.js'|add_itop_version }}"></script>
{# Typeahead files for autocomplete #}

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

@@ -1388,7 +1388,7 @@
$this->Set('team_id', $oParentTicket->Get('team_id'));
$this->Set('agent_id', $oParentTicket->Get('agent_id'));
}
$sParent = '[['.get_class($oParentTicket).':'.$oParentTicket->Get('ref').']]';
$sParent = '[['.get_class($oParentTicket).':'.$oParentTicket->GetKey().'|'.$oParentTicket->Get('ref').']]';
$this->Set('solution', Dict::Format('Tickets:ResolvedFrom', $sParent, MetaModel::GetName(get_class($oParentTicket))));
$this->ApplyStimulus('ev_autoresolve');
$this->DBUpdate();

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

@@ -1430,7 +1430,7 @@
$this->Set('team_id', $oParentTicket->Get('team_id'));
$this->Set('agent_id', $oParentTicket->Get('agent_id'));
}
$sParent = '[['.get_class($oParentTicket).':'.$oParentTicket->Get('ref').']]';
$sParent = '[['.get_class($oParentTicket).':'.$oParentTicket->GetKey().'|'.$oParentTicket->Get('ref').']]';
$this->Set('solution', Dict::Format('Tickets:ResolvedFrom', $sParent, MetaModel::GetName(get_class($oParentTicket))));
$this->ApplyStimulus('ev_autoresolve');
$this->DBUpdate();

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

@@ -231,6 +231,11 @@
<callback>OnLinksChangedTicket</callback>
<rank>0</rank>
</event_listener>
<event_listener id="UpdateImpactAnalysisLocal">
<event>EVENT_DB_BEFORE_WRITE</event>
<callback>OnBeforeWriteTicket</callback>
<rank>0</rank>
</event_listener>
</event_listeners>
<methods>
<method id="OnLinksChangedTicket">
@@ -241,6 +246,20 @@
public function OnLinksChangedTicket(Combodo\iTop\Service\Events\EventData $oEventData)
{
$this->UpdateImpactedItems();
}
]]></code>
</method>
<method id="OnBeforeWriteTicket">
<static>false</static>
<access>public</access>
<type>EventListener</type>
<code><![CDATA[
public function OnBeforeWriteTicket(Combodo\iTop\Service\Events\EventData $oEventData)
{
$aChanges = $this->ListChanges();
if ($this->IsNew() || array_key_exists('functionalcis_list', $aChanges) || array_key_exists('contacts_list', $aChanges)) {
$this->UpdateImpactedItems();
}
}
]]></code>
</method>