composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-04-21 09:38:48 +02:00
Code Issues Packages Projects Releases Wiki Activity

N°1192 Fix crash with default parameters of the rule

Browse Source
This commit is contained in:
Molkobain
2019-11-25 15:30:51 +01:00
parent 0ee77d8c88
commit 85932eab98
2 changed files with 24 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
datamodels/2.x/itop-portal-base/portal/src/Helper/NavigationRuleHelper.php
View File

@@ -22,6 +22,7 @@ namespace Combodo\iTop\Portal\Helper;
use Combodo\iTop\DesignElement;
use Combodo\iTop\Portal\Brick\BrickCollection;
use Combodo\iTop\Portal\Brick\BrowseBrick;
use Combodo\iTop\Portal\Brick\ManageBrick;
use DBObject;
use DBObjectSet;
@@ -454,10 +455,10 @@ class NavigationRuleHelper
*/
protected function LoadGoToManageBrickRuleFromXML(DesignElement $oRuleNode)
{
$sRuleId = $oRuleNode->getAttribute('id');
// Default values
$aRule = $this->GetDefaultGoToBrickRuleDefinition();
$aRule['properties']['route']['id'] = 'p_manage_brick_display_as';
$aRule['properties']['route']['params']['sDisplayMode'] = ManageBrick::DEFAULT_DISPLAY_MODE;
// Rule parameters to automatically map to the route parameters
$aParamsMapping = array(
@@ -489,10 +490,10 @@ class NavigationRuleHelper
*/
protected function LoadGoToBrowseBrickRuleFromXML(DesignElement $oRuleNode)
{
$sRuleId = $oRuleNode->getAttribute('id');
// Default values
$aRule = $this->GetDefaultGoToBrickRuleDefinition();
$aRule['properties']['route']['id'] = 'p_browse_brick_mode';
$aRule['properties']['route']['params']['sBrowseMode'] = BrowseBrick::DEFAULT_BROWSE_MODE;
// Rule parameters to automatically map to the route parameters
$aParamsMapping = array(

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

@@ -1372,6 +1372,13 @@
</form>
<form id="ticket-create">
<class>Ticket</class>
<properties>
<navigation_rules>
<submit>
<default>go-to-open-requests</default>
</submit>
</navigation_rules>
</properties>
<fields />
<twig>
<div class="row">
@@ -1413,10 +1420,14 @@
<form id="ticket-edit">
<class>Ticket</class>
<properties>
<!--Display mode of the form fields. "cosy" for a regular labels over values layout; "compact" for a side-by-side layout with input aligned; "dense" for a side-by-side layout with input filling all available space. You can also use a custom css class that will be used on the form as "form_xxx", as well as on the fields as "form_field_xxx".-->
<!-- Optional, display mode of the form fields. "cosy" for a regular labels over values layout; "compact" for a side-by-side
layout with input aligned; "dense" for a side-by-side layout with input filling all available space. You can also use a custom css class that will be used on the form as "form_xxx", as well as on the fields as "form_field_xxx".-->
<!--<display_mode>cosy</display_mode>-->
<!-- When set to false, submit button is hidden when transitions are available on the object (in creation and edit mode). Default is false. -->
<!-- Optional, when set to false, submit button is hidden when transitions are available on the object (in creation and edit
mode). Default is false. -->
<!--<always_show_submit>false</always_show_submit>-->
<!-- Optional, navigation rules to define where to go when clicking on the submit/cancel buttons of the form -->
<!-- <navigation_rules / -->
</properties>
<fields></fields>
<twig>
@@ -1674,14 +1685,14 @@
<!-- <filter>:this->caller_id_friendlyname</filter> -->
</navigation_rule>
<!-- Open a browse brick -->
<!-- <navigation_rule id="go-to-services" xsi:type="go-to-browse-brick"> -->
<!-- Mandatory, ID of the BrowseBrick to go to -->
<!-- <id>services</id> -->
<!-- Optional, must be an ID of the available browse modes of the brick (//brick/browse_modes/availables/mode) -->
<!-- <browse_mode>tree</browse_mode> -->
<!-- Optional, a string to preset as filter in the brick. ":this->XXX" can be used for the current object -->
<!-- <filter>computer</filter> -->
<!-- </navigation_rule> -->
<navigation_rule id="go-to-services" xsi:type="go-to-browse-brick">
<!-- Mandatory, ID of the BrowseBrick to go to -->
<id>services</id>
<!-- Optional, must be an ID of the available browse modes of the brick (//brick/browse_modes/availables/mode) -->
<!-- <browse_mode>tree</browse_mode> -->
<!-- Optional, a string to preset as filter in the brick. ":this->XXX" can be used for the current object -->
<!-- <filter>computer</filter> -->
</navigation_rule>
<!-- Open a brick, developer method -->
<!-- <navigation_rule id="go-to-open-requests-alternate-way" xsi:type="go-to-brick"> -->
<!-- <route> -->