Merge pull request #113 from camicroscope/develop

For 3.7.1
camicroscope · Apr 3, 2020 · a8d98b8 · a8d98b8
2 parents d614e84 + f734b60
commit a8d98b8
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/caMicroscope.yml b/caMicroscope.yml
@@ -23,9 +23,9 @@ services:
       - mongo
   back:
     build:
-      context: "https://github.com/camicroscope/caracal.git#v3.7.0"
+      context: "https://github.com/camicroscope/caracal.git#v3.7.1"
       args:
-        viewer: "v3.7.0"
+        viewer: "v3.7.1"
     depends_on:
       - "mongo"
     ports:

diff --git a/config/default_data.js b/config/default_data.js
@@ -26,7 +26,7 @@ let defaultTemplate = {
 db.template.insert(defaultTemplate)
 
 var defaultConfigs=[{
-   config_name:"preset_label",
+   name:"preset_label",
    configuration:[
       {
          title:"Lymph",
@@ -431,4 +431,4 @@ var defaultConfigs=[{
    ]
 }];
 
-db.configuration.insertMany(defaultConfigs)
+db.config.insertMany(defaultConfigs)
diff --git a/config/mongo_idx.js b/config/mongo_idx.js
@@ -11,4 +11,4 @@ db.template.createIndex({'name': 1})
 db.heatmap.createIndex({"provenance.image.slide": 1, "provenance.analysis.execution_id": 1})
 db.heatmap.createIndex({"provenance.image.slide": 1})
 db.heatmapEdit.createIndex({"provenance.image.slide":1, "provenance.analysis.execution_id":1, "user_id":1})
-db.configuration.createIndex({'config_name': 1}, { unique: true })
+db.config.createIndex({'name': 1}, { unique: true })