fix - soft delete in quota binary tree & CO level of show organizations

This commit is contained in:
2025-11-01 10:12:58 +03:30
parent 364a15acf8
commit fc67266d64
6 changed files with 60 additions and 44 deletions

View File

@@ -332,17 +332,24 @@ class OrganizationViewSet(BaseViewSet, SoftDeleteMixin, ModelViewSet, DynamicSea
def get_organizations_by_province(self, request):
""" list of organizations by province """
if 'province' in request.GET.keys():
queryset = self.get_queryset(show_my_org=True).filter(province=int(request.GET['province']))
else:
queryset = self.get_queryset().filter(province=request.user.province)
org = get_organization_by_user(request.user)
if 'exclude' in request.GET.keys():
queryset = queryset.exclude(type__key=request.GET['exclude'])
# if user organization activity is on country level show all
# else show by province
if org.field_of_activity != 'CO':
if 'province' in request.GET.keys():
queryset = self.get_queryset(show_my_org=True).filter(province=int(request.GET['province']))
else:
queryset = self.get_queryset().filter(province=request.user.province)
if 'exclude' in request.GET.keys():
queryset = queryset.exclude(type__key=request.GET['exclude'])
else:
queryset = self.get_queryset()
filtered_query = self.filter_query(queryset)
page = self.paginate_queryset(filtered_query.order_by('-create_date')) # paginate queryset
page = self.paginate_queryset(filtered_query.order_by('-modify_date')) # paginate queryset
if page is not None:
serializer = self.serializer_class(page, many=True)

View File

@@ -1,17 +0,0 @@
# Generated by Django 5.0 on 2025-10-29 13:55
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('authentication', '0043_alter_user_options_alter_user_managers'),
]
operations = [
migrations.AlterField(
model_name='user',
name='username',
field=models.CharField(max_length=150, unique=False),
),
]

View File

@@ -1,19 +0,0 @@
# Generated by Django 5.0 on 2025-11-01 05:12
import django.contrib.auth.validators
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('authentication', '0044_remove_username_unique'),
]
operations = [
migrations.AlterField(
model_name='user',
name='username',
field=models.CharField(error_messages={'unique': 'A user with that username already exists.'}, help_text='Required. 150 characters or fewer. Letters, digits and @/./+/-/_ only.', max_length=150, unique=True, validators=[django.contrib.auth.validators.UnicodeUsernameValidator()], verbose_name='username'),
),
]