set default helpers required to 1 for rooms, add more info in room admin views
continuous-integration/drone/push Build is passing
Details
continuous-integration/drone/push Build is passing
Details
This commit is contained in:
parent
22d70d1e26
commit
283b2a7817
|
@ -13,15 +13,24 @@ from .models import Helper, LoginToken, Message, Room, Shift, ShiftRegistration
|
|||
logger = logging.getLogger(__name__)
|
||||
|
||||
|
||||
class ShiftInline(admin.TabularInline):
|
||||
model = Shift
|
||||
fields = ("deleted", "start_at", "required_helpers")
|
||||
|
||||
|
||||
@admin.register(Room)
|
||||
class RoomAdmin(admin.ModelAdmin):
|
||||
list_display = ("name", "description_length")
|
||||
list_display = ("name", "description_length", "shift_count")
|
||||
inlines = [ShiftInline]
|
||||
|
||||
def description_length(self, object):
|
||||
if object.description:
|
||||
return len(object.description)
|
||||
return 0
|
||||
|
||||
def shift_count(self, object):
|
||||
return object.shift_set.filter(deleted=False).count()
|
||||
|
||||
|
||||
@admin.register(Shift)
|
||||
class ShiftAdmin(admin.ModelAdmin):
|
||||
|
|
|
@ -16,7 +16,7 @@ global_preferences = global_preferences_registry.manager()
|
|||
|
||||
class Room(models.Model):
|
||||
name = models.CharField(max_length=200, primary_key=True)
|
||||
required_helpers = models.IntegerField()
|
||||
required_helpers = models.IntegerField(default=1)
|
||||
meeting_location = models.TextField(default="Infopoint")
|
||||
description = models.TextField(blank=True, default="")
|
||||
send_reminders = models.BooleanField(default=True)
|
||||
|
|
Loading…
Reference in New Issue