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

Ticket transitions: 'reassign' force change of agent, agent and team in 'assigned' state are read-only, user satisfaction and user comment are read-only in 'closed' state.

Browse Source 
In Enhanced Portal: 're-open' prompt for caselog and 'on-going tickets' brick has a modified label (english and french) and ticket count is now displayed on each tab.

SVN:trunk[4797]
This commit is contained in:
Vincent Dumas
2017-07-04 15:50:20 +00:00
parent d80c2293dc
commit f8b6fb51c2
6 changed files with 96 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -549,10 +549,12 @@
<attribute id="team_id">
<mandatory/>
<must_prompt/>
<read_only/>
</attribute>
<attribute id="agent_id">
<mandatory/>
<must_prompt/>
<read_only/>
</attribute>
<attribute id="assignment_date">
<read_only/>
@@ -611,6 +613,14 @@
<transition id="ev_reassign">
<target>assigned</target>
<actions/>
<flags>
<attribute id="agent_id">
<must_change/>
</attribute>
<attribute id="team_id">
<must_prompt/>
</attribute>
</flags>
</transition>
<transition id="ev_timeout">
<target>escalated_ttr</target>
@@ -922,12 +932,13 @@
</attribute>
<attribute id="pending_reason">
<read_only/>
<read_only/>
</attribute>
<attribute id="user_satisfaction">
<must_prompt/>
<read_only/>
<must_prompt/>
</attribute>
<attribute id="user_comment">
<read_only/>
<must_prompt/>
</attribute>
</flags>

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

@@ -596,10 +596,12 @@
<attribute id="team_id">
<mandatory/>
<must_prompt/>
<read_only/>
</attribute>
<attribute id="agent_id">
<mandatory/>
<must_prompt/>
<read_only/>
</attribute>
<attribute id="approver_id">
<read_only/>
@@ -660,6 +662,14 @@
</transition>
<transition id="ev_reassign">
<target>assigned</target>
<flags>
<attribute id="agent_id">
<must_change/>
</attribute>
<attribute id="team_id">
<must_prompt/>
</attribute>
</flags>
<actions/>
</transition>
<transition id="ev_timeout">
@@ -1050,9 +1060,11 @@
<read_only/>
</attribute>
<attribute id="user_satisfaction">
<read_only/>
<must_prompt/>
</attribute>
<attribute id="user_comment">
<read_only/>
<must_prompt/>
</attribute>
</flags>

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

@@ -596,10 +596,12 @@
<attribute id="team_id">
<mandatory/>
<must_prompt/>
<read_only/>
</attribute>
<attribute id="agent_id">
<mandatory/>
<must_prompt/>
<read_only/>
</attribute>
<attribute id="approver_id">
<read_only/>
@@ -661,6 +663,14 @@
<transition id="ev_reassign">
<target>assigned</target>
<actions/>
<flags>
<attribute id="agent_id">
<must_change/>
</attribute>
<attribute id="team_id">
<must_prompt/>
</attribute>
</flags>
</transition>
<transition id="ev_timeout">
<target>escalated_ttr</target>
@@ -1050,12 +1060,13 @@
</attribute>
<attribute id="pending_reason">
<read_only/>
<read_only/>
</attribute>
<attribute id="user_satisfaction">
<read_only/>
<must_prompt/>
</attribute>
<attribute id="user_comment">
<read_only/>
<must_prompt/>
</attribute>
</flags>

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

@@ -1164,7 +1164,7 @@
<!-- Mandatory -->
<tabs>
<!-- Optional. Show object count for each tabs. Available values are true|false. Default is false. -->
<!--<show_tab_counts>false</show_tab_counts>-->
<show_tab_counts>true</show_tab_counts>
<!-- Mandatory. Grouping by tabs -->
<!--<attribute>operational_status</attribute>-->
<!-- attribute xor groups tag -->
@@ -1338,48 +1338,50 @@
<fields></fields>
<twig>
<div class="row">
<div class="col-sm-6">
<div class="form_field" data-field-id="caller_id" data-field-flags="read_only">
</div>
<div class="form_field" data-field-id="service_id" data-field-flags="read_only">
</div>
<div class="form_field" data-field-id="servicesubcategory_id" data-field-flags="read_only">
</div>
<div class="form_field" data-field-id="title" data-field-flags="read_only">
</div>
<div class="form_field" data-field-id="description" data-field-flags="read_only">
</div>
<div class="form_field" data-field-id="solution" data-field-flags="read_only">
</div>
<div class="form_field" data-field-id="user_satisfaction" data-field-flags="read_only">
</div>
<div class="form_field" data-field-id="user_comment" data-field-flags="read_only">
</div>
<div class="col-sm-7">
<fieldset>
<legend>{{'Ticket:baseinfo'|dict_s}}</legend>
<div class="col-sm-6">
<div class="form_field" data-field-id="title" data-field-flags="read_only"></div>
<div class="form_field" data-field-id="service_id" data-field-flags="read_only"></div>
</div>
<div class="col-sm-6">
<div class="form_field" data-field-id="caller_id" data-field-flags="read_only"></div>
<div class="form_field" data-field-id="servicesubcategory_id" data-field-flags="read_only"></div>
</div>
<div class="col-sm-12">
<div class="form_field" data-field-id="description" data-field-flags="read_only"></div>
<div class="form_field" data-field-id="solution" data-field-flags="read_only"></div>
</div>
<div class="col-sm-6">
<div class="form_field" data-field-id="user_satisfaction" data-field-flags="read_only"></div>
</div>
<div class="col-sm-6">
<div class="form_field" data-field-id="user_comment" data-field-flags="read_only"></div>
</div>
</fieldset>
</div>
<div class="col-sm-6">
<div class="form_field" data-field-id="status" data-field-flags="read_only">
</div>
<div class="form_field" data-field-id="impact" data-field-flags="read_only">
</div>
<div class="form_field" data-field-id="urgency" data-field-flags="read_only">
</div>
<div class="form_field" data-field-id="priority" data-field-flags="read_only">
</div>
<div class="form_field" data-field-id="start_date" data-field-flags="read_only">
</div>
<div class="form_field" data-field-id="last_update" data-field-flags="read_only">
</div>
<div class="form_field" data-field-id="resolution_date" data-field-flags="read_only">
</div>
<div class="form_field" data-field-id="agent_id" data-field-flags="read_only">
</div>
<div class="col-sm-5">
<fieldset>
<legend>{{'Ticket:Type'|dict_s}} &amp; {{'Ticket:date'|dict_s}}</legend>
<div class="col-sm-6">
<div class="form_field" data-field-id="status" data-field-flags="read_only"></div>
<div class="form_field" data-field-id="impact" data-field-flags="read_only"></div>
<div class="form_field" data-field-id="urgency" data-field-flags="read_only"></div>
<div class="form_field" data-field-id="priority" data-field-flags="read_only"></div>
</div>
<div class="col-sm-6">
<div class="form_field" data-field-id="start_date" data-field-flags="read_only"></div>
<div class="form_field" data-field-id="last_update" data-field-flags="read_only"></div>
<div class="form_field" data-field-id="resolution_date" data-field-flags="read_only"></div>
<div class="form_field" data-field-id="agent_id" data-field-flags="read_only"></div>
</div>
</fieldset>
</div>
</div>
<div>
<div class="form_field" data-field-id="contacts_list">
</div>
<div class="form_field" data-field-id="public_log">
</div>
<div class="form_field" data-field-id="contacts_list"></div>
<div class="form_field" data-field-id="public_log"></div>
</div>
</twig>
<modes>
@@ -1387,17 +1389,28 @@
<mode id="view"/>
</modes>
</form>
<form id="ticket-apply-stimulus">
<form id="ticket-reopen">
<class>Ticket</class>
<fields />
<twig>
<div>
<div class="form_field" data-field-id="team_id" data-field-flags="read_only">
</div>
<div class="form_field" data-field-id="agent_id" data-field-flags="read_only">
</div>
<div class="form_field" data-field-id="public_log" data-field-flags="must_prompt"></div>
<div class="form_field" data-field-id="team_id" data-field-flags="hidden"></div>
<div class="form_field" data-field-id="agent_id" data-field-flags="hidden"></div>
</div>
</twig>
<modes>
<mode id="apply_stimulus">
<stimuli>
<stimulus id="ev_reopen"/>
</stimuli>
</mode>
</modes>
</form>
<form id="ticket-apply-stimulus">
<class>Ticket</class>
<fields />
<twig />
<modes>
<mode id="apply_stimulus"/>
</modes>

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

@@ -250,7 +250,7 @@ Dict::Add('EN US', 'English', 'English', array(
'Brick:Portal:NewRequest:Title+' => '<p>Need help?</p><p>Pick from the services catalog and submit your request to our support teams.</p>',
'Brick:Portal:OngoingRequests:Title' => 'Ongoing requests',
'Brick:Portal:OngoingRequests:Title+' => '<p>Follow up with your ongoing requests.</p><p>Check the progress, add comments, attach documents, acknowledge the solution.</p>',
'Brick:Portal:OngoingRequests:Tab:OnGoing' => 'On going',
'Brick:Portal:OngoingRequests:Tab:OnGoing' => 'Open',
'Brick:Portal:OngoingRequests:Tab:Resolved' => 'Resolved',
'Brick:Portal:ClosedRequests:Title' => 'Closed requests',
));

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

@@ -236,7 +236,7 @@ Dict::Add('FR FR', 'French', 'Français', array(
'Brick:Portal:NewRequest:Title+' => '<p>Besoin d\'assistance&nbsp;?</p><p>Choisissez un service (assistance ou dépannage) et soumettez votre requête à nos équipes de support.</p>',
'Brick:Portal:OngoingRequests:Title' => 'Requêtes en cours',
'Brick:Portal:OngoingRequests:Title+' => '<p>Suivez vos requêtes en cours.</p><p>Consultez l\'avancement, ajoutez des commentaires ou des pièces jointes, validez la solution.</p>',
'Brick:Portal:OngoingRequests:Tab:OnGoing' => 'En cours',
'Brick:Portal:OngoingRequests:Tab:OnGoing' => 'Ouvertes',
'Brick:Portal:OngoingRequests:Tab:Resolved' => 'Résolues',
'Brick:Portal:ClosedRequests:Title' => 'Requêtes fermées',
));