Merge pull request #1833 from 4dn-dcic/upd_sugenum_ajs

Upd sugenum ajs
4dn-dcic · Aug 3, 2023 · e6542da · e6542da
2 parents f210215 + 0946bd8
commit e6542da
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 7 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -6,6 +6,15 @@ fourfront
 Change Log
 ----------
 
+6.1.1
+=====
+
+`suggested enums and purge fix <https://github.com/4dn-dcic/fourfront/pull/1833>`_
+
+* add muscle cell values to bcc suggested enums
+* Repair user_info resolution bug
+
+
 6.1.0
 =====
 * Fix for MIME type ordering in renderers.py (differs between cgap and fourfront).

diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -1,7 +1,7 @@
 [tool.poetry]
 # Note: Various modules refer to this system as "encoded", not "fourfront".
 name = "encoded"
-version = "6.1.0"
+version = "6.1.1"
 description = "4DN-DCIC Fourfront"
 authors = ["4DN-DCIC Team <support@4dnucleome.org>"]
 license = "MIT"
@@ -47,7 +47,7 @@ colorama = "0.3.3"
 # we get odd 'pyo3_runtime.PanicException: Python API call failed' error on import
 # of cryptography.hazmat.bindings._rust in cryptography package. 2023-04-21.
 cryptography = "39.0.2"
-dcicsnovault = "^9.1.0"
+dcicsnovault = "^9.1.1"
 dcicutils = "^7.5.0"
 elasticsearch = "7.13.4"
 elasticsearch-dsl = "^7.0.0"  # TODO: port code from cgap-portal to get rid of uses

diff --git a/src/encoded/project/authentication.py b/src/encoded/project/authentication.py
@@ -10,7 +10,7 @@ def login(self, context, request, *, samesite):
         return super().login(context, request, samesite=samesite)
 
     def namespaced_authentication_policy_authenticated_userid(self, namespaced_authentication_policy, request, set_user_info_property):
-        set_user_info_property = False
+        set_user_info_property = True
         return super().namespaced_authentication_policy_authenticated_userid(namespaced_authentication_policy, request, set_user_info_property)
 
     def note_auth0_authentication_policy_unauthenticated_userid(self, auth0_authentication_policy, request, email, id_token):

diff --git a/src/encoded/schemas/biosample_cell_culture.json b/src/encoded/schemas/biosample_cell_culture.json
@@ -144,6 +144,9 @@
                 "hepatoblast",
                 "hepatocyte",
                 "mesoderm",
+                "muscle cell",
+                "muscle precursor cell",
+                "myoblast",
                 "neural progenitor cell",
                 "neuronal stem cell",
                 "pancreatic endoderm",