Skip to content

S
slapos.core
Commit da09343a authored by Rafael Monnerat's avatar Rafael Monnerat
Browse files
Options

slapos_panel: Display Subscription Request as Ticket until it is invalidated 

   If the Subscription Request still submitted, display it on ticket list, so the user has some information on what is going on.
parent adb55677
Hide whitespace changes
Inline Side-by-side
Showing with 13 additions and 53 deletions
master/bt5/slapos_panel/SkinTemplateItem/portal_skins/slapos_panel/ComputeNode_viewOnSlaposPanel/ticket_listbox.xml
View file @ da09343a
...@@ -182,7 +182,7 @@ ...@@ -182,7 +182,7 @@
<dictionary> <dictionary>
<item> <item>
<key> <string>_text</string> </key> <key> <string>_text</string> </key>
<value> <string>python: [(\'default_causality_uid\', context.getUid())]</string> </value> <value> <string>python: [(\'causality__uid\', context.getUid()), (\'simulation_state\', \'!=invalidated\')]</string> </value>
</item> </item>
</dictionary> </dictionary>
</pickle> </pickle>
......
master/bt5/slapos_panel/SkinTemplateItem/portal_skins/slapos_panel/InstanceTree_viewOnSlaposPanel/listbox.xml
View file @ da09343a
...@@ -198,6 +198,10 @@ ...@@ -198,6 +198,10 @@
<string>Upgrade Decision</string> <string>Upgrade Decision</string>
<string>Upgrade Decision</string> <string>Upgrade Decision</string>
</tuple> </tuple>
<tuple>
<string>Subscription Request</string>
<string>Subscription Request</string>
</tuple>
</list> </list>
</value> </value>
</item> </item>
......
master/bt5/slapos_panel/SkinTemplateItem/portal_skins/slapos_panel/SupportRequestModule_viewMyTicketListOnSlaposPanel/listbox.xml
View file @ da09343a
...@@ -228,18 +228,6 @@ ...@@ -228,18 +228,6 @@
<string>Ticket_getCausalityAsText</string> <string>Ticket_getCausalityAsText</string>
<string>Message Text</string> <string>Message Text</string>
</tuple> </tuple>
<tuple>
<string>destination_decision_reference</string>
<string>Requester Reference</string>
</tuple>
<tuple>
<string>destination_project_title</string>
<string>Requested Project</string>
</tuple>
<tuple>
<string>source_project_title</string>
<string>Handled Project</string>
</tuple>
<tuple> <tuple>
<string>owner_title</string> <string>owner_title</string>
<string>Owner</string> <string>Owner</string>
...@@ -252,14 +240,6 @@ ...@@ -252,14 +240,6 @@
<string>modification_date</string> <string>modification_date</string>
<string>Modification Date</string> <string>Modification Date</string>
</tuple> </tuple>
<tuple>
<string>SupportRequest_recheckMonitoring</string>
<string>Recheck</string>
</tuple>
<tuple>
<string>follow_up_title</string>
<string>Incident Response</string>
</tuple>
</list> </list>
</value> </value>
</item> </item>
...@@ -272,12 +252,12 @@ ...@@ -272,12 +252,12 @@
<string>Title</string> <string>Title</string>
</tuple> </tuple>
<tuple> <tuple>
<string>resource_title</string> <string>portal_type</string>
<string>Type</string> <string>Portal Type</string>
</tuple> </tuple>
<tuple> <tuple>
<string>source_decision_title</string> <string>resource_title</string>
<string>Supervisor</string> <string>Type</string>
</tuple> </tuple>
<tuple> <tuple>
<string>creation_date</string> <string>creation_date</string>
...@@ -287,10 +267,6 @@ ...@@ -287,10 +267,6 @@
<string>destination_decision_title</string> <string>destination_decision_title</string>
<string>Requester</string> <string>Requester</string>
</tuple> </tuple>
<tuple>
<string>follow_up_title</string>
<string>Incident Response</string>
</tuple>
<tuple> <tuple>
<string>modification_date</string> <string>modification_date</string>
<string>Modification Date</string> <string>Modification Date</string>
...@@ -299,10 +275,6 @@ ...@@ -299,10 +275,6 @@
<string>translated_simulation_state_title</string> <string>translated_simulation_state_title</string>
<string>State</string> <string>State</string>
</tuple> </tuple>
<tuple>
<string>SupportRequest_recheckMonitoring</string>
<string>Recheck</string>
</tuple>
</list> </list>
</value> </value>
</item> </item>
...@@ -353,6 +325,10 @@ ...@@ -353,6 +325,10 @@
<string>Support Request</string> <string>Support Request</string>
<string>Support Request</string> <string>Support Request</string>
</tuple> </tuple>
<tuple>
<string>Subscription Request</string>
<string>Subscription Request</string>
</tuple>
</list> </list>
</value> </value>
</item> </item>
...@@ -467,14 +443,6 @@ ...@@ -467,14 +443,6 @@
<key> <string>sort</string> </key> <key> <string>sort</string> </key>
<value> <value>
<list> <list>
<tuple>
<string>follow_up_title</string>
<string>Incident ASC</string>
</tuple>
<tuple>
<string>source_decision_title</string>
<string>ASC</string>
</tuple>
<tuple> <tuple>
<string>modification_date</string> <string>modification_date</string>
<string>DESC</string> <string>DESC</string>
...@@ -574,18 +542,6 @@ ...@@ -574,18 +542,6 @@
<string>owner_title</string> <string>owner_title</string>
<string>Owner</string> <string>Owner</string>
</tuple> </tuple>
<tuple>
<string>creation_date</string>
<string>Creation Date</string>
</tuple>
<tuple>
<string>modification_date</string>
<string>Modification Date</string>
</tuple>
<tuple>
<string>follow_up_title</string>
<string>Incident Response</string>
</tuple>
</list> </list>
</value> </value>
</item> </item>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7