A lot of changes related to person and membership
This commit is contained in:
@@ -9,7 +9,7 @@ from app.lib_general import log, logging, secure_hash_string
|
||||
|
||||
from app.models.common_field_schema import base_fields, default_num_bytes
|
||||
# from app.models.contact_models import Contact_Base
|
||||
# from app.models.membership_member_models import Membership_Member_Base
|
||||
# from app.models.membership_person_models import Membership_Person_Base
|
||||
from app.models.organization_models import Organization_Base
|
||||
from app.models.person_models import Person_Base # Causes circular import
|
||||
# from app.models.user_role_models import User_Role_Base
|
||||
@@ -194,8 +194,8 @@ class User_Out_Base(BaseModel):
|
||||
event_list: Optional[list] # Event_Base() # Priority complete
|
||||
hosted_file_list: Optional[list] # Hosted_File_Base() # Priority l3
|
||||
journal_list: Optional[list] # Journal_Base() # Priority l3
|
||||
# membership_member: Optional[Membership_Member_Base] # Priority l2
|
||||
# membership_member_list: Optional[list] # Membership_Base() ???
|
||||
# membership_person: Optional[Membership_Person_Base] # Priority l2
|
||||
# membership_person_list: Optional[list] # Membership_Base() ???
|
||||
order_list: Optional[list] # Order_Base() # Priority l2
|
||||
order_cart_list: Optional[list] # Order_Base() # Priority l2
|
||||
organization: Optional[Union[Organization_Base, None]] # Organization_Base() # Priority l3
|
||||
@@ -278,8 +278,6 @@ class User_Base(BaseModel):
|
||||
event_list: Optional[list] # Event_Base() # Priority l1
|
||||
hosted_file_list: Optional[list] # Hosted_File_Base() # Priority l2
|
||||
journal_list: Optional[list] # Journal_Base() # Priority l3
|
||||
# membership_member: Optional[Membership_Member_Base] # Priority l2
|
||||
# membership_member_list: Optional[list] # Membership_Base() ???
|
||||
order_list: Optional[list] # Order_Base() # Priority l2
|
||||
order_cart_list: Optional[list] # Order_Base() # Priority l2
|
||||
organization: Optional[Union[Organization_Base, None]] # Organization_Base() # Priority l3
|
||||
|
||||
Reference in New Issue
Block a user