diff --git a/roles/lib/files/FWO.Api.Client/GraphQlApiSubscription.cs b/roles/lib/files/FWO.Api.Client/GraphQlApiSubscription.cs
index 3f3db2d38..1136ca260 100644
--- a/roles/lib/files/FWO.Api.Client/GraphQlApiSubscription.cs
+++ b/roles/lib/files/FWO.Api.Client/GraphQlApiSubscription.cs
@@ -1,4 +1,4 @@
-using FWO.Logging;
+using FWO.Logging;
using GraphQL;
using GraphQL.Client.Http;
using Newtonsoft.Json.Linq;
@@ -69,7 +69,7 @@ protected virtual void CreateSubscription()
if (response.Data == null)
{
// Terminate subscription
- subscription.Dispose();
+ subscription?.Dispose();
}
else
{
diff --git a/roles/ui/files/FWO.UI/Pages/NetworkModelling/RequestFwChangePopup.razor b/roles/ui/files/FWO.UI/Pages/NetworkModelling/RequestFwChangePopup.razor
index bd229e133..4c6cb6bb1 100644
--- a/roles/ui/files/FWO.UI/Pages/NetworkModelling/RequestFwChangePopup.razor
+++ b/roles/ui/files/FWO.UI/Pages/NetworkModelling/RequestFwChangePopup.razor
@@ -47,7 +47,11 @@
@(context.OnManagement?.Name)
-
+
+
+ @DisplayTitle(context)
+
+
@(RequestInProcess ? states.Name[context.StateId] : "")
@@ -319,6 +323,17 @@
return "";
}
+ private MarkupString DisplayTitle(WfReqTask task)
+ {
+ if((task.TaskType == WfTaskType.rule_delete.ToString() || task.TaskType == WfTaskType.group_delete.ToString()) ||
+ ((task.TaskType == WfTaskType.rule_modify.ToString() || task.TaskType == WfTaskType.group_modify.ToString()) && task.Elements.Any(_ => _.RequestAction == RequestAction.delete.ToString())))
+ {
+ return new MarkupString($"{task.Title}");
+ }
+
+ return new MarkupString(task.Title);
+ }
+
private async Task StartRequests()
{
WorkInProgress = true;