dcm4che/dcm4chee-arc-light#2775 : RS Forwarding : Enable selection of…

… Web Applications configured on other devices
dcm4che · Sep 16, 2020 · 9f58991 · 9f58991
1 parent 28a9934
commit 9f58991
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 9 deletions.
diff --git a/src/main/webapp/assets/schema/hi/rsForwardRule.schema.json b/src/main/webapp/assets/schema/hi/rsForwardRule.schema.json
@@ -18,7 +18,7 @@
       "title": "वेब अनुप्रयोग का नाम",
       "description": "वेब अनुप्रयोग का नाम ।",
       "type": "string",
-      "format": "dcmWebApp"
+      "format": "webApp"
     },
     "dcmTLSAllowAnyHostname": {
       "title": "टी.एल.एस. (TLS) किसी भी मेज़बान को अनुमति दे",

diff --git a/src/main/webapp/assets/schema/hi/webApplication.schema.json b/src/main/webapp/assets/schema/hi/webApplication.schema.json
@@ -13,8 +13,6 @@
       "description": "वेब अनुप्रयोग का नाम ।",
       "type": "string",
       "use": [
-        "$.dcmDevice.dcmArchiveDevice.dcmRSForwardRule[*].dcmWebAppName",
-        "$.dicomNetworkAE[*].dcmNetworkAE.dcmArchiveNetworkAE.dcmRSForwardRule[*].dcmWebAppName",
         "$.dicomNetworkAE[*].dcmNetworkAE.dcmArchiveNetworkAE.dcmFallbackWadoURIWebAppName",
         "$.dcmDevice.dcmArchiveDevice.dcmFallbackWadoURIWebAppName"
       ]

diff --git a/src/main/webapp/assets/schema/it/rsForwardRule.schema.json b/src/main/webapp/assets/schema/it/rsForwardRule.schema.json
@@ -18,7 +18,7 @@
       "title": "Nome dell'applicazione web",
       "description": "Nome dell'applicazione Web",
       "type": "string",
-      "format": "dcmWebApp"
+      "format": "webApp"
     },
     "dcmTLSAllowAnyHostname": {
       "title": "TLS Consente qualsiasi nome host",

diff --git a/src/main/webapp/assets/schema/it/webApplication.schema.json b/src/main/webapp/assets/schema/it/webApplication.schema.json
@@ -13,8 +13,6 @@
       "description": "Nome dell'applicazione Web",
       "type": "string",
       "use": [
-        "$.dcmDevice.dcmArchiveDevice.dcmRSForwardRule[*].dcmWebAppName",
-        "$.dicomNetworkAE[*].dcmNetworkAE.dcmArchiveNetworkAE.dcmRSForwardRule[*].dcmWebAppName",
         "$.dicomNetworkAE[*].dcmNetworkAE.dcmArchiveNetworkAE.dcmFallbackWadoURIWebAppName",
         "$.dcmDevice.dcmArchiveDevice.dcmFallbackWadoURIWebAppName"
       ]

diff --git a/src/main/webapp/assets/schema/rsForwardRule.schema.json b/src/main/webapp/assets/schema/rsForwardRule.schema.json
@@ -18,7 +18,7 @@
       "title": "Web Application name",
       "description": "Name of the Web Application",
       "type": "string",
-      "format": "dcmWebApp"
+      "format": "webApp"
     },
     "dcmTLSAllowAnyHostname": {
       "title": "TLS Allow Any Hostname",

diff --git a/src/main/webapp/assets/schema/webApplication.schema.json b/src/main/webapp/assets/schema/webApplication.schema.json
@@ -13,8 +13,6 @@
       "description": "Name of the Web Application",
       "type": "string",
       "use": [
-        "$.dcmDevice.dcmArchiveDevice.dcmRSForwardRule[*].dcmWebAppName",
-        "$.dicomNetworkAE[*].dcmNetworkAE.dcmArchiveNetworkAE.dcmRSForwardRule[*].dcmWebAppName",
         "$.dicomNetworkAE[*].dcmNetworkAE.dcmArchiveNetworkAE.dcmFallbackWadoURIWebAppName",
         "$.dcmDevice.dcmArchiveDevice.dcmFallbackWadoURIWebAppName"
       ]