diff --git a/src/gameservers/admin.py b/src/gameservers/admin.py index 90e300d..786f5c4 100644 --- a/src/gameservers/admin.py +++ b/src/gameservers/admin.py @@ -1,10 +1,15 @@ from django.contrib import admin -from .models import Server +from .models import PrivateServer, Server + +class PrivateServerAdmin(admin.ModelAdmin): + list_display = ['title', 'site_url', 'active'] + search_fields = ['title'] class ServerAdmin(admin.ModelAdmin): list_display = ['title', 'site_url'] search_fields = ['title'] +admin.site.register(PrivateServer, PrivateServerAdmin) admin.site.register(Server, ServerAdmin) diff --git a/src/gameservers/migrations/0015_privateserver.py b/src/gameservers/migrations/0015_privateserver.py new file mode 100644 index 0000000..d507f18 --- /dev/null +++ b/src/gameservers/migrations/0015_privateserver.py @@ -0,0 +1,28 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + +from django.db import models, migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('gameservers', '0014_auto_20150315_1430'), + ] + + operations = [ + migrations.CreateModel( + name='PrivateServer', + fields=[ + ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), + ('title', models.CharField(max_length=255)), + ('site_url', models.URLField(blank=True)), + ('host', models.CharField(max_length=255)), + ('port', models.PositiveIntegerField()), + ('active', models.BooleanField(default=False)), + ], + options={ + 'ordering': ['-active', 'title'], + }, + ), + ] diff --git a/src/gameservers/models.py b/src/gameservers/models.py index a9a85e4..8a93c5a 100644 --- a/src/gameservers/models.py +++ b/src/gameservers/models.py @@ -19,6 +19,21 @@ DAY_NAMES = [ ] +@python_2_unicode_compatible +class PrivateServer(models.Model): + title = models.CharField(max_length=255) + site_url = models.URLField(blank=True) + host = models.CharField(max_length=255) + port = models.PositiveIntegerField() + active = models.BooleanField(default=False) + + class Meta: + ordering = ['-active', 'title'] + + def __str__(self): + return self.title + + @python_2_unicode_compatible class Server(models.Model): title = models.CharField(max_length=255) @@ -103,6 +118,7 @@ class Server(models.Model): tmp = [0,0,0,0,0,0,0] return zip(DAY_NAMES, tmp) + @python_2_unicode_compatible class ServerHistory(models.Model): server = models.ForeignKey(Server)