From 693219d49e6cd7f28e76f97d3290011ac25f1261 Mon Sep 17 00:00:00 2001 From: Emrah Atil Date: Thu, 13 Aug 2020 14:40:58 -0600 Subject: [PATCH] Common tool certification added as prereq to other tool certifications --- apiserver/apiserver/api/views.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/apiserver/apiserver/api/views.py b/apiserver/apiserver/api/views.py index d8ae6b5..ed24e96 100644 --- a/apiserver/apiserver/api/views.py +++ b/apiserver/apiserver/api/views.py @@ -379,11 +379,11 @@ class LockoutViewSet(viewsets.ViewSet, List): authorization['id'] = member.id authorization['name'] = member.first_name + ' ' + member.last_name authorization['common'] = bool(member.orientation_date or member.vetted_date) - authorization['lathe'] = bool(member.lathe_cert_date) - authorization['mill'] = bool(member.mill_cert_date) - authorization['wood'] = bool(member.wood_cert_date) - authorization['wood2'] = bool(member.wood2_cert_date) - authorization['cnc'] = bool(member.cnc_cert_date) + authorization['lathe'] = bool(member.lathe_cert_date) and authorization['common'] + authorization['mill'] = bool(member.mill_cert_date) and authorization['common'] + authorization['wood'] = bool(member.wood_cert_date) and authorization['common'] + authorization['wood2'] = bool(member.wood2_cert_date) and authorization['common'] + authorization['cnc'] = bool(member.cnc_cert_date) and authorization['common'] active_member_cards[card.card_number] = authorization