Merge pull request 'fix' (#54) from behruz into main
All checks were successful
Deploy to Production / build-and-deploy (push) Successful in 1m51s
All checks were successful
Deploy to Production / build-and-deploy (push) Successful in 1m51s
Reviewed-on: #54
This commit is contained in:
@@ -1,21 +1,21 @@
|
||||
from django.contrib import admin
|
||||
# from django.contrib import admin
|
||||
|
||||
from core.apps.shared.models import RegionModel, DistrictModel, VillageModel
|
||||
# from core.apps.shared.models import RegionModel, DistrictModel, VillageModel
|
||||
|
||||
|
||||
@admin.register(RegionModel)
|
||||
class RegionAdmin(admin.ModelAdmin):
|
||||
list_display = ('name', 'code')
|
||||
search_fields = ('name', 'code')
|
||||
# @admin.register(RegionModel)
|
||||
# class RegionAdmin(admin.ModelAdmin):
|
||||
# list_display = ('name', 'code')
|
||||
# search_fields = ('name', 'code')
|
||||
|
||||
|
||||
@admin.register(DistrictModel)
|
||||
class DistrictAdmin(admin.ModelAdmin):
|
||||
list_display = ('name', 'code', 'region')
|
||||
search_fields = ('name', 'code')
|
||||
# @admin.register(DistrictModel)
|
||||
# class DistrictAdmin(admin.ModelAdmin):
|
||||
# list_display = ('name', 'code', 'region')
|
||||
# search_fields = ('name', 'code')
|
||||
|
||||
|
||||
@admin.register(VillageModel)
|
||||
class VillageAdmin(admin.ModelAdmin):
|
||||
list_display = ('name', 'code', 'district')
|
||||
search_fields = ('name', 'code')
|
||||
# @admin.register(VillageModel)
|
||||
# class VillageAdmin(admin.ModelAdmin):
|
||||
# list_display = ('name', 'code', 'district')
|
||||
# search_fields = ('name', 'code')
|
||||
|
||||
@@ -1,28 +1,28 @@
|
||||
from django.db import models
|
||||
from django_core.models import AbstractBaseModel
|
||||
# from django.db import models
|
||||
# from django_core.models import AbstractBaseModel
|
||||
|
||||
|
||||
class RegionModel(AbstractBaseModel):
|
||||
name = models.CharField(max_length=255, unique=True)
|
||||
# class RegionModel(AbstractBaseModel):
|
||||
# name = models.CharField(max_length=255, unique=True)
|
||||
|
||||
class Meta:
|
||||
verbose_name = "Region"
|
||||
verbose_name_plural = "Regions"
|
||||
# class Meta:
|
||||
# verbose_name = "Region"
|
||||
# verbose_name_plural = "Regions"
|
||||
|
||||
|
||||
class DistrictModel(AbstractBaseModel):
|
||||
name = models.CharField(max_length=255, unique=True)
|
||||
region = models.ForeignKey(RegionModel, on_delete=models.CASCADE, related_name='districts')
|
||||
# class DistrictModel(AbstractBaseModel):
|
||||
# name = models.CharField(max_length=255, unique=True)
|
||||
# region = models.ForeignKey(RegionModel, on_delete=models.CASCADE, related_name='districts')
|
||||
|
||||
class Meta:
|
||||
verbose_name = "District"
|
||||
verbose_name_plural = "Districts"
|
||||
# class Meta:
|
||||
# verbose_name = "District"
|
||||
# verbose_name_plural = "Districts"
|
||||
|
||||
|
||||
class VillageModel(AbstractBaseModel):
|
||||
name = models.CharField(max_length=255, unique=True)
|
||||
district = models.ForeignKey(DistrictModel, on_delete=models.CASCADE, related_name='villages')
|
||||
# class VillageModel(AbstractBaseModel):
|
||||
# name = models.CharField(max_length=255, unique=True)
|
||||
# district = models.ForeignKey(DistrictModel, on_delete=models.CASCADE, related_name='villages')
|
||||
|
||||
class Meta:
|
||||
verbose_name = "Village"
|
||||
verbose_name_plural = "Villages"
|
||||
# class Meta:
|
||||
# verbose_name = "Village"
|
||||
# verbose_name_plural = "Villages"
|
||||
|
||||
Reference in New Issue
Block a user