From 785bf5b5bc6f18859b8508192a6afe927467e7f6 Mon Sep 17 00:00:00 2001
From: bmccandless <bmccandless@chanzuckerberg.com>
Date: Mon, 23 Mar 2020 13:25:17 -0700
Subject: [PATCH] update for the legal configuration options (#1281)

* Configuration for legal information
---
 server/cli/launch.py            | 1 -
 server/common/app_config.py     | 4 ++++
 server/common/default_config.py | 2 ++
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/server/cli/launch.py b/server/cli/launch.py
index c3da01f7..e36e1b8b 100644
--- a/server/cli/launch.py
+++ b/server/cli/launch.py
@@ -231,7 +231,6 @@ def launch_args(func):
         "--config-file",
         "-c",
         "config_file",
-        is_flag=True,
         default=None,
         show_default=True,
         help="Location to yaml file with configuration settings",
diff --git a/server/common/app_config.py b/server/common/app_config.py
index 64082323..b908685e 100644
--- a/server/common/app_config.py
+++ b/server/common/app_config.py
@@ -50,6 +50,8 @@ class AppConfig(object):
             self.server__port = dc["server"]["port"]
             self.server__scripts = dc["server"]["scripts"]
             self.server__open_browser = dc["server"]["open_browser"]
+            self.server__about_legal_tos = dc["server"]["about_legal_tos"]
+            self.server__about_legal_privacy = dc["server"]["about_legal_privacy"]
             self.multi_dataset__dataroot = dc["multi_dataset"]["dataroot"]
             self.multi_dataset__index = dc["multi_dataset"]["index"]
             self.multi_dataset__allowed_matrix_types = dc["multi_dataset"]["allowed_matrix_types"]
@@ -401,6 +403,8 @@ class AppConfig(object):
             "annotations_cell_ontology_obopath": None,
             "annotations_cell_ontology_terms": None,
             "diffexp-may-be-slow": False,
+            "about_legal_tos": self.server__about_legal_tos,
+            "about_legal_privacy": self.server__about_legal_privacy,
         }
 
         data_adaptor.update_parameters(parameters)
diff --git a/server/common/default_config.py b/server/common/default_config.py
index ded28029..d6801c31 100644
--- a/server/common/default_config.py
+++ b/server/common/default_config.py
@@ -10,6 +10,8 @@ server:
   port : null
   scripts : []
   open_browser: false
+  about_legal_tos: null
+  about_legal_privacy: null
 
 presentation:
   max_categories: 1000