Merging from upstream

LesionTracker/bin/orthancDICOMWeb.bat

@@ -1,2 +1,2 @@
-PACKAGE_DIRS=..\Packages
+set PACKAGE_DIRS=..\Packages
 meteor --settings ../config/orthancDICOMWeb.json

Packages/lesiontracker/package.js

@@ -197,10 +197,6 @@ Package.onUse(function(api) {
 
     api.addFiles('client/components/lastLoginModal/lastLoginModal.html', 'client');
 
-    api.addFiles('client/components/confirmDeleteDialog/confirmDeleteDialog.html', 'client');
-    api.addFiles('client/components/confirmDeleteDialog/confirmDeleteDialog.styl', 'client');
-    api.addFiles('client/components/confirmDeleteDialog/confirmDeleteDialog.js', 'client');
-
     api.addFiles('client/components/emailVerification/emailVerification.html', 'client');
     api.addFiles('client/components/emailVerification/emailVerification.styl', 'client');
     api.addFiles('client/components/emailVerification/emailVerification.js', 'client');

Packages/ohif-core/client/components/base/mixins/form.js

@@ -17,6 +17,9 @@ OHIF.mixins.form = new OHIF.Mixin({
             // Set the form identifier flag
             component.isForm = true;
 
+            // Set the form validated flag
+            component.isValidatedAlready = false;
+
             component.validationObserver = new Tracker.Dependency();
 
             // Reset the pathKey
@@ -34,6 +37,9 @@ OHIF.mixins.form = new OHIF.Mixin({
                 // Call the original validation function
                 validateSelf();
 
+                // Change the form validated flag to true
+                component.isValidatedAlready = true;
+
                 // Focus the first error field if some validation failed
                 if (component.schema && component.schema._invalidKeys.length) {
                     instance.$('.state-error :input:first').focus();

Packages/ohif-core/client/components/base/mixins/formItem.js

@@ -261,8 +261,11 @@ OHIF.mixins.formItem = new OHIF.Mixin({
                     // Enable reactivity by changing a Tracker.Dependency observer
                     component.changeObserver.changed();
 
-                    // Revalidate the component
-                    component.validate();
+                    const form = component.getForm();
+                    if (form && form.isValidatedAlready) {
+                        // Revalidate the component if form is already validated
+                        component.validate();
+                    }
                 }
             },
 

Packages/viewerbase/lib/createStacks.js

@@ -84,7 +84,8 @@ function makeDisplaySet(series, instances) {
         seriesDescription: series.seriesDescription,
         numImageFrames: instances.length,
         frameRate: instance.frameTime,
-        images: instances
+        images: instances,
+        modality: series.modality
     };
 
     // Sort the images in this series

Packages/viewerbase/package.js

@@ -174,6 +174,7 @@ Package.onUse(function(api) {
     api.export('toggleDialog', 'client');
     api.export('isImage', 'client');
     api.export('sopClassDictionary', 'client');
+    api.export('addMetaData', 'client');
 
     // Viewer management objects
     api.export('toolManager', 'client');

Packages/worklist/client/components/worklistResult/worklistResult.js

@@ -167,7 +167,7 @@ function search() {
                 (convertStringToStudyDate(study.studyDate) <= new Date(studyDateTo).setHours(0, 0, 0, 0) || !studyDateTo || studyDateTo === '')) {
 
                 // Convert numberOfStudyRelatedInstance string into integer
-                study.numberOfStudyRelatedInstances = !isNaN(study.numberOfStudyRelatedInstances) ? parseInt(study.numberOfStudyRelatedInstances) : 0;
+                study.numberOfStudyRelatedInstances = !isNaN(study.numberOfStudyRelatedInstances) ? parseInt(study.numberOfStudyRelatedInstances) : undefined;
 
                 // Insert any matching studies into the WorklistStudies Collection
                 WorklistStudies.insert(study);