[~] Error texts ids CactuseSecurity#3062

Author: SolidProgramming

roles/database/files/sql/idempotent/fworch-texts.sql

@@ -1156,14 +1156,6 @@ INSERT INTO txt VALUES ('add_interface', 	    'German',	'Schnittstelle hinzuf&uu
 INSERT INTO txt VALUES ('add_interface', 	    'English',	'Add Interface');
 INSERT INTO txt VALUES ('edit_interface', 	    'German',	'Schnittstelle bearbeiten');
 INSERT INTO txt VALUES ('edit_interface', 	    'English',	'Edit Interface');
-INSERT INTO txt VALUES ('interface_contain_nwarea','German','Schnittstellen dürfen keine Netzbereiche enthalten');
-INSERT INTO txt VALUES ('interface_contain_nwarea','English','Interfaces must not contain network areas');
-INSERT INTO txt VALUES ('direction_contain_nwarea','German','Quelle und Ziel dürfen nicht gleichzeitig einen Netzbereich enthalten');
-INSERT INTO txt VALUES ('direction_contain_nwarea','English','Source and destination must not contain a network area at the same time');
-INSERT INTO txt VALUES ('only_common_service',  'German',   'Dieser Netzbereich kann nur in der Registerkarte Gemeinsame Dienste verwendet werden.');
-INSERT INTO txt VALUES ('only_common_service',  'English',  'This network area can only be used in common services tab');
-INSERT INTO txt VALUES ('foreign_interface_na', 'German',   'Netzbereiche können nicht zusammen mit Schnittstellen anderer Apps genutzt werden.');
-INSERT INTO txt VALUES ('foreign_interface_na', 'English',  'Network areas cannot be used together with interfaces from foreign apps.');
 INSERT INTO txt VALUES ('delete_interface', 	'German',	'Schnittstelle löschen');
 INSERT INTO txt VALUES ('delete_interface', 	'English',	'Delete Interface');
 INSERT INTO txt VALUES ('insert_forbidden', 	'German',	'Einfügen verboten');
@@ -2869,6 +2861,14 @@ INSERT INTO txt VALUES ('U9019', 'German',  'Sind sie sicher, dass sie die Exter
 INSERT INTO txt VALUES ('U9019', 'English', 'Are you sure you want to reinit the external requests for following ticket: ');
 INSERT INTO txt VALUES ('U9020', 'German',  'Die externe Beantragung wurde gestartet.');
 INSERT INTO txt VALUES ('U9020', 'English', 'External Request initialized.');
+INSERT INTO txt VALUES ('U9021', 'German',  'Schnittstellen dürfen keine Netzbereiche enthalten');
+INSERT INTO txt VALUES ('U9021', 'English', 'Interfaces must not contain network areas');
+INSERT INTO txt VALUES ('U9022', 'German',  'Quelle und Ziel dürfen nicht gleichzeitig einen Netzbereich enthalten');
+INSERT INTO txt VALUES ('U9022', 'English', 'Source and destination must not contain a network area at the same time');
+INSERT INTO txt VALUES ('U9023', 'German',  'Dieser Netzbereich kann nur in der Registerkarte Gemeinsame Dienste verwendet werden.');
+INSERT INTO txt VALUES ('U9023', 'English', 'This network area can only be used in common services tab');
+INSERT INTO txt VALUES ('U9024', 'German',  'Netzbereiche können nicht zusammen mit Schnittstellen anderer Apps genutzt werden.');
+INSERT INTO txt VALUES ('U9024', 'English', 'Network areas cannot be used together with interfaces from foreign apps.');
 
 -- error messages
 INSERT INTO txt VALUES ('E0001', 'German',  'Nicht klassifizierter Fehler: ');

roles/lib/files/FWO.Services/ModellingConnectionHandler.cs

@@ -337,13 +337,13 @@ public bool NetworkAreaUseAllowed(List<ModellingNetworkArea> networkAreas, Direc
 
             if (IsAreaForbiddenInDirection(direction))
             {
-                reason.Text = userConfig.GetText("direction_contain_nwarea");
+                reason.Text = userConfig.GetText("U9022");
                 return false;
             }
 
             if (ActConn.IsInterface)
             {
-                reason.Text = userConfig.GetText("interface_contain_nwarea");
+                reason.Text = userConfig.GetText("U9021");
                 return false;
             }
 
@@ -358,7 +358,7 @@ public bool NetworkAreaUseAllowed(List<ModellingNetworkArea> networkAreas, Direc
                 return true;
             }
 
-            reason.Text = userConfig.GetText("only_common_service");
+            reason.Text = userConfig.GetText("U9023");
             return false;
         }
 

roles/ui/files/FWO.UI/Pages/NetworkModelling/EditConn.razor

@@ -491,7 +491,7 @@
         {
             if (ConnHandler is not null && !ConnHandler.InterfaceAllowedWithNetworkArea(Container.ConnElement))
             {
-                DisplayMessageInUi(default, userConfig.GetText("edit_connection"), userConfig.GetText("foreign_interface_na"), true);
+                DisplayMessageInUi(default, userConfig.GetText("edit_connection"), userConfig.GetText("U9024"), true);
                 Container.Clear();
                 return;
             }
@@ -515,7 +515,7 @@
             {
                 if (ConnHandler is not null && !ConnHandler.InterfaceAllowedWithNetworkArea())
                 {
-                    DisplayMessageInUi(default, userConfig.GetText("edit_connection"), userConfig.GetText("foreign_interface_na"), true);
+                    DisplayMessageInUi(default, userConfig.GetText("edit_connection"), userConfig.GetText("U9024"), true);
                     Container.Clear();
                     return;
                 }
@@ -547,7 +547,7 @@
         {
             if (ConnHandler is not null && !ConnHandler.InterfaceAllowedWithNetworkArea(Container.ConnElement))
             {
-                DisplayMessageInUi(default, userConfig.GetText("edit_connection"), userConfig.GetText("foreign_interface_na"), true);
+                DisplayMessageInUi(default, userConfig.GetText("edit_connection"), userConfig.GetText("U9024"), true);
                 Container.Clear();
                 return;
             }
@@ -571,7 +571,7 @@
             {
                 if (ConnHandler is not null && !ConnHandler.InterfaceAllowedWithNetworkArea())
                 {
-                    DisplayMessageInUi(default, userConfig.GetText("edit_connection"), userConfig.GetText("foreign_interface_na"), true);
+                    DisplayMessageInUi(default, userConfig.GetText("edit_connection"), userConfig.GetText("U9024"), true);
                     Container.Clear();
                     return;
                 }

roles/ui/files/FWO.UI/Pages/NetworkModelling/EditConnLeftSide.razor

@@ -300,7 +300,7 @@
     {
         if (ConnHandler is not null && !ConnHandler.InterfaceAllowedWithNetworkArea(interf))
         {
-            DisplayMessageInUi(default, userConfig.GetText("edit_connection"), userConfig.GetText("foreign_interface_na"), true);           
+            DisplayMessageInUi(default, userConfig.GetText("edit_connection"), userConfig.GetText("U9024"), true);           
             return false;
         }
 
@@ -366,7 +366,7 @@
         {
             if (ConnHandler is not null && !ConnHandler.InterfaceAllowedWithNetworkArea())
             {
-                DisplayMessageInUi(default, userConfig.GetText("edit_connection"), userConfig.GetText("foreign_interface_na"), true);
+                DisplayMessageInUi(default, userConfig.GetText("edit_connection"), userConfig.GetText("U9024"), true);
                 selectedNwElems = new();
                 return;
             }