diff --git a/bizdev/admin.py b/bizdev/admin.py index 439303d..6605648 100644 --- a/bizdev/admin.py +++ b/bizdev/admin.py @@ -91,7 +91,7 @@ class ProspectAdmin(SyncedObjectAdmin): readonly_fields = ['related_activities', 'entity_names', 'current_status', 'id'] fieldsets = [ (None, { - 'fields': ['related_activities', 'id', 'entity_names', 'related_user', 'first_name', 'last_name', 'email', 'phone', 'official_user', 'name_unsure', 'entities'] + 'fields': ['related_activities', 'id', 'entity_names', 'first_name', 'last_name', 'email', 'phone', 'official_user', 'name_unsure', 'entities'] }), ] list_display = ('entity_names', 'first_name', 'last_name', 'email', 'last_update', 'current_status') @@ -102,6 +102,7 @@ class ProspectAdmin(SyncedObjectAdmin): ordering = ['-last_update'] filter_horizontal = ['entities'] actions = ['send_email', create_activity_for_prospect, contacted_by_sms, mark_as_should_test, mark_as_testing, mark_as_customer, declined_too_expensive, declined_use_something_else] + raw_id_fields = ['official_user'] def related_activities(self, obj): activities = obj.activities.all() diff --git a/sync/signals.py b/sync/signals.py index acce299..9719746 100644 --- a/sync/signals.py +++ b/sync/signals.py @@ -119,25 +119,26 @@ def save_model_log(users, model_operation, model_name, model_id, store_id): with transaction.atomic(): created_logs = [] for user in users: - # logger.info(f'Creating ModelLog for user {user.id} - user exists: {User.objects.filter(id=user.id).exists()}') - model_log = ModelLog( - user=user, - operation=model_operation, - model_name=model_name, - model_id=model_id, - store_id=store_id, - device_id=device_id - ) - model_log.save() - # logger.info(f'ModelLog saved with ID: {model_log.id}') - created_logs.append(model_log.id) + if user.can_synchronize: + # logger.info(f'Creating ModelLog for user {user.id} - user exists: {User.objects.filter(id=user.id).exists()}') + model_log = ModelLog( + user=user, + operation=model_operation, + model_name=model_name, + model_id=model_id, + store_id=store_id, + device_id=device_id + ) + model_log.save() + # logger.info(f'ModelLog saved with ID: {model_log.id}') + created_logs.append(model_log.id) # Immediate verification within transaction - immediate_count = ModelLog.objects.filter(id__in=created_logs).count() + # immediate_count = ModelLog.objects.filter(id__in=created_logs).count() # logger.info(f'*** Within transaction: Created {len(created_logs)}, found {immediate_count}') # Verification after transaction commits - persisted_count = ModelLog.objects.filter(id__in=created_logs).count() + # persisted_count = ModelLog.objects.filter(id__in=created_logs).count() # logger.info(f'*** After transaction: Created {len(created_logs)}, persisted {persisted_count}') except Exception as e: