Merge branch 'develop' of github.com:cables-gl/cables_dev into develop

cables-gl · May 21, 2024 · e621a05 · e621a05
2 parents 191a9bc + b0b4cdd
commit e621a05
Showing 1 changed file with 14 additions and 14 deletions.
diff --git a/shared/api/utils/shared_ops_util.js b/shared/api/utils/shared_ops_util.js
@@ -1288,32 +1288,32 @@ export default class SharedOpsUtil extends SharedUtil
 
         if (this.isCoreOp(outerName))
         {
-            if (this.isExtensionOp(innerName)) return "Core ops cannot contain extension ops.";
-            if (this.isTeamOp(innerName)) return "Core ops cannot contain team ops.";
-            if (this.isUserOp(innerName)) return "Core ops cannot contain user ops.";
-            if (this.isPatchOp(innerName)) return "Core ops cannot contain patch ops.";
+            if (this.isExtensionOp(innerName)) return "(SubpatchOp) Core ops cannot contain extension ops.";
+            if (this.isTeamOp(innerName)) return "(SubpatchOp) Core ops cannot contain team ops.";
+            if (this.isUserOp(innerName)) return "(SubpatchOp) Core ops cannot contain user ops.";
+            if (this.isPatchOp(innerName)) return "(SubpatchOp) Core ops cannot contain patch ops.";
         }
         else if (this.isExtensionOp(outerName))
         {
-            if (this.isExtensionOp(innerName) && this.getNamespace(innerName) !== this.getNamespace(outerName)) return "Extension ops cannot contain ops of other extensions.";
-            if (this.isTeamOp(innerName)) return "Extension ops cannot contain team ops.";
-            if (this.isUserOp(innerName)) return "Extension ops connot contain user ops.";
-            if (this.isPatchOp(innerName)) return "Extension ops cannot contain patch ops.";
+            if (this.isExtensionOp(innerName) && this.getNamespace(innerName) !== this.getNamespace(outerName)) return "(SubpatchOp) Extension ops cannot contain ops of other extensions.";
+            if (this.isTeamOp(innerName)) return "(SubpatchOp) Extension ops cannot contain team ops.";
+            if (this.isUserOp(innerName)) return "(SubpatchOp) Extension ops cannot contain user ops.";
+            if (this.isPatchOp(innerName)) return "(SubpatchOp) Extension ops cannot contain patch ops.";
         }
         else if (this.isTeamOp(outerName))
         {
-            if (this.isTeamOp(innerName) && this.getNamespace(innerName) !== this.getNamespace(outerName)) return "Team ops cannot contain ops of other teams.";
-            if (this.isUserOp(innerName)) return "Team ops cannot contain user ops.";
-            if (this.isPatchOp(innerName)) return "Team ops cannot contain patch ops.";
+            if (this.isTeamOp(innerName) && this.getNamespace(innerName) !== this.getNamespace(outerName)) return "(SubpatchOp) Team ops cannot contain ops of other teams.";
+            if (this.isUserOp(innerName)) return "(SubpatchOp) Team ops cannot contain user ops.";
+            if (this.isPatchOp(innerName)) return "(SubpatchOp) Team ops cannot contain patch ops.";
         }
         else if (this.isUserOp(outerName))
         {
-            if (this.isUserOp(innerName) && this.getNamespace(innerName) !== this.getNamespace(outerName)) return "User ops cannot contain ops of other users.";
-            if (this.isPatchOp(innerName)) return "User ops cannot contain patch ops.";
+            if (this.isUserOp(innerName) && this.getNamespace(innerName) !== this.getNamespace(outerName)) return "(SubpatchOp) User ops cannot contain ops of other users.";
+            if (this.isPatchOp(innerName)) return "(SubpatchOp) User ops cannot contain patch ops.";
         }
         else if (this.isPatchOp(outerName))
         {
-            if (this.isPatchOp(innerName) && this.getNamespace(innerName) !== this.getNamespace(outerName)) return "Patch ops cannot contain ops of other patches.";
+            if (this.isPatchOp(innerName) && this.getNamespace(innerName) !== this.getNamespace(outerName)) return "(SubpatchOp) Patch ops cannot contain ops of other patches.";
         }
         else
         {