Merge pull request #816 from cortex-lab/dev

Dev

alyx/actions/admin.py

@@ -478,6 +478,7 @@ class TasksAdminInline(BaseInlineAdmin):
     extra = 0
     fields = ('status', 'name', 'version', 'parents', 'datetime', 'arguments')
     readonly_fields = ('name', 'version', 'parents', 'datetime', 'arguments')
+    ordering = ('status',)
 
 
 def _pass_narrative_templates(context):

alyx/alyx/__init__.py

@@ -1 +1 @@
-VERSION = __version__ = '1.16.1'
+VERSION = __version__ = '1.16.2'

alyx/jobs/templatetags/jobs_template_tags.py

@@ -93,6 +93,13 @@ def get_task_colour(status):
         return "color:MediumSeaGreen"
 
 
+@register.filter
+def get_parents(obj):
+    parents = obj.parents.all()
+
+    return parents
+
+
 @register.simple_tag(takes_context=True)
 def param_replace(context, **kwargs):
     """

alyx/subjects/admin.py

@@ -1419,16 +1419,17 @@ def queryset(self, request, queryset):
 
 
 class CullMiceAdmin(SubjectAdmin):
-    list_display = ['nickname', 'birth_date', 'death_date', 'sex_f', 'ear_mark',
-                    'line', 'cage', 'responsible_user', 'to_be_culled', 'reduced', 'cull_l']
+    list_display = ['nickname', 'to_be_culled', 'birth_date', 'death_date', 'sex_f', 'ear_mark',
+                    'line', 'zygosities', 'cage', 'responsible_user', 'reduced', 'cull_l']
     ordering = ['-birth_date', '-nickname']
     list_filter = [ResponsibleUserListFilter,
                    CullSubjectAliveListFilter,
+                   ZygosityFilter,
                    ('line', LineDropdownFilter),
                    ]
     list_editable = ['death_date', 'to_be_culled', 'reduced']
 
-    ordering = ('-birth_date',)
+    ordering = ['-birth_date', '-nickname']
 
     def sex_f(self, obj):
         return obj.sex[0] if obj.sex else ''

requirements_frozen.txt

@@ -1,26 +1,26 @@
 asgiref==3.7.2
 backports.zoneinfo==0.2.1
-boto3==1.28.65
-botocore==1.31.65
+boto3==1.28.71
+botocore==1.31.71
 certifi==2023.7.22
 cffi==1.16.0
-charset-normalizer==3.3.0
+charset-normalizer==3.3.1
 click==8.1.7
 colorlog==6.7.0
 contourpy==1.1.1
 coreapi==2.3.3
 coreschema==0.0.4
 coverage==6.5.0
 coveralls==3.3.1
-cryptography==41.0.4
+cryptography==41.0.5
 cycler==0.12.1
 Django==4.2.6
 django-admin-list-filter-dropdown==1.0.3
 django-admin-rangefilter==0.11.2
 django-autocomplete-light==3.9.7
 django-cleanup==8.0.0
 django-filter==21.1
-django-ipware==5.0.1
+django-ipware==5.0.2
 django-js-asset==2.1.0
 django-mptt==0.14.0
 django-polymorphic==3.1.0
@@ -44,13 +44,13 @@ itypes==1.2.0
 Jinja2==3.1.2
 jmespath==1.0.1
 kiwisolver==1.4.5
-llvmlite==0.41.0
+llvmlite==0.41.1
 lxml==4.9.3
 Markdown==3.5
 MarkupSafe==2.1.3
 matplotlib==3.7.3
 mccabe==0.7.0
-numba==0.58.0
+numba==0.58.1
 numpy==1.24.4
 ONE-api==2.4.0
 packaging==23.2