# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1599543787 -7200
# Node ID ee9b2e2c7e19d24dd54b967c2cd5010c149d5ed4
# Parent  3576616904d3945b253780da2ce5c4a89974167f# Parent  669f588a14b37504d18ac0d1be3acdd59e36d171
merge

diff -r 669f588a14b3 -r ee9b2e2c7e19 OrthancFramework/Sources/Enumerations.cpp
--- a/OrthancFramework/Sources/Enumerations.cpp	Tue Sep 08 07:42:47 2020 +0200
+++ b/OrthancFramework/Sources/Enumerations.cpp	Tue Sep 08 07:43:07 2020 +0200
@@ -797,9 +797,6 @@
       case ModalityManufacturer_GenericNoUniversalWildcard:
         return "GenericNoUniversalWildcard";
 
-      case ModalityManufacturer_StoreScp:
-        return "StoreScp";
-      
       case ModalityManufacturer_Vitrea:
         return "Vitrea";
       
@@ -1551,10 +1548,6 @@
     {
       return ModalityManufacturer_GenericNoUniversalWildcard;
     }
-    else if (manufacturer == "StoreScp")
-    {
-      return ModalityManufacturer_StoreScp;
-    }
     else if (manufacturer == "Vitrea")
     {
       return ModalityManufacturer_Vitrea;
diff -r 669f588a14b3 -r ee9b2e2c7e19 OrthancFramework/Sources/Enumerations.h
--- a/OrthancFramework/Sources/Enumerations.h	Tue Sep 08 07:42:47 2020 +0200
+++ b/OrthancFramework/Sources/Enumerations.h	Tue Sep 08 07:43:07 2020 +0200
@@ -645,7 +645,6 @@
     ModalityManufacturer_Generic,
     ModalityManufacturer_GenericNoWildcardInDates,
     ModalityManufacturer_GenericNoUniversalWildcard,
-    ModalityManufacturer_StoreScp,
     ModalityManufacturer_Vitrea,
     ModalityManufacturer_GE
   };
diff -r 669f588a14b3 -r ee9b2e2c7e19 OrthancServer/Plugins/Samples/ConnectivityChecks/WebResources/app.js
--- a/OrthancServer/Plugins/Samples/ConnectivityChecks/WebResources/app.js	Tue Sep 08 07:42:47 2020 +0200
+++ b/OrthancServer/Plugins/Samples/ConnectivityChecks/WebResources/app.js	Tue Sep 08 07:43:07 2020 +0200
@@ -42,7 +42,7 @@
             this.dicomNodes[alias]['alias'] = alias;
             this.dicomNodes[alias]['status'] = 'testing';
             axios
-              .post('../../modalities/' + alias + '/echo')
+              .post('../../modalities/' + alias + '/echo', {})
               .then(response => {
                 this.dicomNodes[alias]['status'] = 'ok';
                 this.$forceUpdate();
diff -r 669f588a14b3 -r ee9b2e2c7e19 OrthancServer/Resources/Configuration.json
--- a/OrthancServer/Resources/Configuration.json	Tue Sep 08 07:42:47 2020 +0200
+++ b/OrthancServer/Resources/Configuration.json	Tue Sep 08 07:43:07 2020 +0200
@@ -194,7 +194,6 @@
      *   in outgoing C-Find requests originating from Orthanc),
      * - "GenericNoUniversalWildcard" (to replace "*" by "" in all fields
      *   in outgoing C-Find SCU requests originating from Orthanc),
-     * - "StoreScp" (storescp tool from DCMTK),
      * - "Vitrea",
      * - "GE" (Enterprise Archive, MRI consoles and Advantage Workstation
      *   from GE Healthcare).
@@ -222,6 +221,8 @@
      * "EnableTranscoding" is set to "true".
      *
      * By default, all "Allow*" options are true.
+     * "AllowStorageCommitment" is actually an alias for 
+     * "AllowNAction" & "AllowEventReport".
      **/
     //"untrusted" : {
     //  "AET" : "ORTHANC",
diff -r 669f588a14b3 -r ee9b2e2c7e19 OrthancServer/UnitTestsSources/ServerJobsTests.cpp
--- a/OrthancServer/UnitTestsSources/ServerJobsTests.cpp	Tue Sep 08 07:42:47 2020 +0200
+++ b/OrthancServer/UnitTestsSources/ServerJobsTests.cpp	Tue Sep 08 07:43:07 2020 +0200
@@ -618,7 +618,7 @@
       modality.SetApplicationEntityTitle("REMOTE");
       modality.SetHost("192.168.1.1");
       modality.SetPortNumber(1000);
-      modality.SetManufacturer(ModalityManufacturer_StoreScp);
+      modality.SetManufacturer(ModalityManufacturer_GE);
 
       StoreScuOperation operation(GetContext(), luaManager, "TEST", modality);
 
@@ -633,7 +633,7 @@
       ASSERT_EQ("REMOTE", tmp.GetRemoteModality().GetApplicationEntityTitle());
       ASSERT_EQ("192.168.1.1", tmp.GetRemoteModality().GetHost());
       ASSERT_EQ(1000, tmp.GetRemoteModality().GetPortNumber());
-      ASSERT_EQ(ModalityManufacturer_StoreScp, tmp.GetRemoteModality().GetManufacturer());
+      ASSERT_EQ(ModalityManufacturer_GE, tmp.GetRemoteModality().GetManufacturer());
       ASSERT_EQ("TEST", tmp.GetLocalAet());
     }
   }
@@ -704,7 +704,7 @@
     modality.SetApplicationEntityTitle("REMOTE");
     modality.SetHost("192.168.1.1");
     modality.SetPortNumber(1000);
-    modality.SetManufacturer(ModalityManufacturer_StoreScp);
+    modality.SetManufacturer(ModalityManufacturer_GE);
 
     DicomModalityStoreJob job(GetContext());
     job.SetLocalAet("LOCAL");
@@ -724,7 +724,7 @@
     ASSERT_EQ("REMOTE", tmp.GetParameters().GetRemoteModality().GetApplicationEntityTitle());
     ASSERT_EQ("192.168.1.1", tmp.GetParameters().GetRemoteModality().GetHost());
     ASSERT_EQ(1000, tmp.GetParameters().GetRemoteModality().GetPortNumber());
-    ASSERT_EQ(ModalityManufacturer_StoreScp, tmp.GetParameters().GetRemoteModality().GetManufacturer());
+    ASSERT_EQ(ModalityManufacturer_GE, tmp.GetParameters().GetRemoteModality().GetManufacturer());
     ASSERT_TRUE(tmp.HasMoveOriginator());
     ASSERT_EQ("MOVESCU", tmp.GetMoveOriginatorAet());
     ASSERT_EQ(42, tmp.GetMoveOriginatorId());
diff -r 669f588a14b3 -r ee9b2e2c7e19 OrthancServer/UnitTestsSources/UnitTestsMain.cpp
--- a/OrthancServer/UnitTestsSources/UnitTestsMain.cpp	Tue Sep 08 07:42:47 2020 +0200
+++ b/OrthancServer/UnitTestsSources/UnitTestsMain.cpp	Tue Sep 08 07:43:07 2020 +0200
@@ -117,7 +117,6 @@
   ASSERT_STREQ("Generic", EnumerationToString(StringToModalityManufacturer("Generic")));
   ASSERT_STREQ("GenericNoWildcardInDates", EnumerationToString(StringToModalityManufacturer("GenericNoWildcardInDates")));
   ASSERT_STREQ("GenericNoUniversalWildcard", EnumerationToString(StringToModalityManufacturer("GenericNoUniversalWildcard")));
-  ASSERT_STREQ("StoreScp", EnumerationToString(StringToModalityManufacturer("StoreScp")));
   ASSERT_STREQ("Vitrea", EnumerationToString(StringToModalityManufacturer("Vitrea")));
   ASSERT_STREQ("GE", EnumerationToString(StringToModalityManufacturer("GE")));
   // backward compatibility tests (to remove once we make these manufacturer really obsolete)