Outlining managers. I know some of these managers sub-modules only have one file in them, but let's keep the convention for consistency.
This commit is contained in:
parent
8ba1a93eeb
commit
43f0ae6af6
10 changed files with 68 additions and 15 deletions
0
apps/config/managers/__init__.py
Normal file
0
apps/config/managers/__init__.py
Normal file
8
apps/config/managers/commandalias.py
Normal file
8
apps/config/managers/commandalias.py
Normal file
|
|
@ -0,0 +1,8 @@
|
||||||
|
"""
|
||||||
|
Custom manager for CommandAlias objects.
|
||||||
|
"""
|
||||||
|
from django.db import models
|
||||||
|
|
||||||
|
class CommandAliasManager(models.Manager):
|
||||||
|
pass
|
||||||
|
|
||||||
8
apps/config/managers/configvalue.py
Normal file
8
apps/config/managers/configvalue.py
Normal file
|
|
@ -0,0 +1,8 @@
|
||||||
|
"""
|
||||||
|
Custom manager for ConfigValue objects.
|
||||||
|
"""
|
||||||
|
from django.db import models
|
||||||
|
|
||||||
|
class ConfigValueManager(models.Manager):
|
||||||
|
pass
|
||||||
|
|
||||||
17
apps/config/managers/connectscreen.py
Normal file
17
apps/config/managers/connectscreen.py
Normal file
|
|
@ -0,0 +1,17 @@
|
||||||
|
"""
|
||||||
|
Custom manager for ConnectScreen objects.
|
||||||
|
"""
|
||||||
|
from django.db import models
|
||||||
|
|
||||||
|
class ConnectScreenManager(models.Manager):
|
||||||
|
def get_random_connect_screen(self):
|
||||||
|
"""
|
||||||
|
Returns a random active connect screen.
|
||||||
|
"""
|
||||||
|
try:
|
||||||
|
return self.filter(is_active=True).order_by('?')[0]
|
||||||
|
except IndexError:
|
||||||
|
new_screen = ConnectScreen(name='Default',
|
||||||
|
connect_screen_text='This is a placeholder connect screen. Remind your admin to edit it through the Admin interface.')
|
||||||
|
new_screen.save()
|
||||||
|
return new_screen
|
||||||
|
|
@ -1,4 +1,7 @@
|
||||||
from django.db import models
|
from django.db import models
|
||||||
|
from apps.config.managers.commandalias import CommandAliasManager
|
||||||
|
from apps.config.managers.configvalue import ConfigValueManager
|
||||||
|
from apps.config.managers.connectscreen import ConnectScreenManager
|
||||||
|
|
||||||
class CommandAlias(models.Model):
|
class CommandAlias(models.Model):
|
||||||
"""
|
"""
|
||||||
|
|
@ -8,6 +11,8 @@ class CommandAlias(models.Model):
|
||||||
user_input = models.CharField(max_length=50)
|
user_input = models.CharField(max_length=50)
|
||||||
equiv_command = models.CharField(max_length=50)
|
equiv_command = models.CharField(max_length=50)
|
||||||
|
|
||||||
|
objects = CommandAliasManager()
|
||||||
|
|
||||||
class Admin:
|
class Admin:
|
||||||
list_display = ('user_input', 'equiv_command',)
|
list_display = ('user_input', 'equiv_command',)
|
||||||
|
|
||||||
|
|
@ -22,22 +27,11 @@ class ConfigValue(models.Model):
|
||||||
conf_key = models.CharField(max_length=100)
|
conf_key = models.CharField(max_length=100)
|
||||||
conf_value = models.TextField()
|
conf_value = models.TextField()
|
||||||
|
|
||||||
|
objects = ConfigValueManager()
|
||||||
|
|
||||||
class Admin:
|
class Admin:
|
||||||
list_display = ('conf_key', 'conf_value',)
|
list_display = ('conf_key', 'conf_value',)
|
||||||
|
|
||||||
class ConnectScreenManager(models.Manager):
|
|
||||||
def get_random_connect_screen(self):
|
|
||||||
"""
|
|
||||||
Returns a random active connect screen.
|
|
||||||
"""
|
|
||||||
try:
|
|
||||||
return self.filter(is_active=True).order_by('?')[0]
|
|
||||||
except IndexError:
|
|
||||||
new_screen = ConnectScreen(name='Default',
|
|
||||||
connect_screen_text='This is a placeholder connect screen. Remind your admin to edit it through the Admin interface.')
|
|
||||||
new_screen.save()
|
|
||||||
return new_screen
|
|
||||||
|
|
||||||
class ConnectScreen(models.Model):
|
class ConnectScreen(models.Model):
|
||||||
"""
|
"""
|
||||||
Stores connect screens. The admins may have only one or multiple, which
|
Stores connect screens. The admins may have only one or multiple, which
|
||||||
|
|
@ -47,7 +41,6 @@ class ConnectScreen(models.Model):
|
||||||
connect_screen_text = models.TextField(help_text="The text for the connect screen. Color codes and substitutions are evaluated.")
|
connect_screen_text = models.TextField(help_text="The text for the connect screen. Color codes and substitutions are evaluated.")
|
||||||
is_active = models.BooleanField(default=1, help_text="Only active connect screens are placed in the rotation")
|
is_active = models.BooleanField(default=1, help_text="Only active connect screens are placed in the rotation")
|
||||||
|
|
||||||
# Custom manager
|
|
||||||
objects = ConnectScreenManager()
|
objects = ConnectScreenManager()
|
||||||
|
|
||||||
class Admin:
|
class Admin:
|
||||||
|
|
|
||||||
8
apps/helpsys/managers/helpentry.py
Normal file
8
apps/helpsys/managers/helpentry.py
Normal file
|
|
@ -0,0 +1,8 @@
|
||||||
|
"""
|
||||||
|
Custom manager for HelpEntry objects.
|
||||||
|
"""
|
||||||
|
from django.db import models
|
||||||
|
|
||||||
|
class HelpEntryManager(models.Manager):
|
||||||
|
pass
|
||||||
|
|
||||||
|
|
@ -1,5 +1,6 @@
|
||||||
from django.db import models
|
|
||||||
import ansi
|
import ansi
|
||||||
|
from django.db import models
|
||||||
|
from apps.helpsys.managers.helpentry import HelpEntryManager
|
||||||
|
|
||||||
class HelpEntry(models.Model):
|
class HelpEntry(models.Model):
|
||||||
"""
|
"""
|
||||||
|
|
@ -8,6 +9,8 @@ class HelpEntry(models.Model):
|
||||||
topicname = models.CharField(max_length=255)
|
topicname = models.CharField(max_length=255)
|
||||||
entrytext = models.TextField(blank=True, null=True)
|
entrytext = models.TextField(blank=True, null=True)
|
||||||
staff_only = models.BooleanField(default=0)
|
staff_only = models.BooleanField(default=0)
|
||||||
|
|
||||||
|
objects = HelpEntryManager()
|
||||||
|
|
||||||
class Admin:
|
class Admin:
|
||||||
list_display = ('id', 'topicname', 'staff_only')
|
list_display = ('id', 'topicname', 'staff_only')
|
||||||
|
|
|
||||||
0
apps/objects/managers/__init__.py
Normal file
0
apps/objects/managers/__init__.py
Normal file
8
apps/objects/managers/commchannel.py
Normal file
8
apps/objects/managers/commchannel.py
Normal file
|
|
@ -0,0 +1,8 @@
|
||||||
|
"""
|
||||||
|
Custom manager for CommChannel objects.
|
||||||
|
"""
|
||||||
|
from django.db import models
|
||||||
|
|
||||||
|
class CommChannelManager(models.Manager):
|
||||||
|
pass
|
||||||
|
|
||||||
|
|
@ -7,6 +7,8 @@ import scripthandler
|
||||||
import defines_global
|
import defines_global
|
||||||
import gameconf
|
import gameconf
|
||||||
import ansi
|
import ansi
|
||||||
|
from apps.objects.managers.commchannel import CommChannelManager
|
||||||
|
from apps.objects.managers.object import ObjectManager
|
||||||
|
|
||||||
class Attribute(models.Model):
|
class Attribute(models.Model):
|
||||||
"""
|
"""
|
||||||
|
|
@ -101,6 +103,8 @@ class Object(models.Model):
|
||||||
nosave_flags = models.TextField(blank=True, null=True)
|
nosave_flags = models.TextField(blank=True, null=True)
|
||||||
date_created = models.DateField(editable=False, auto_now_add=True)
|
date_created = models.DateField(editable=False, auto_now_add=True)
|
||||||
scriptlink = None
|
scriptlink = None
|
||||||
|
|
||||||
|
objects = ObjectManager()
|
||||||
|
|
||||||
def __cmp__(self, other):
|
def __cmp__(self, other):
|
||||||
"""
|
"""
|
||||||
|
|
@ -809,6 +813,8 @@ class CommChannel(models.Model):
|
||||||
owner = models.ForeignKey(Object, related_name="chan_owner")
|
owner = models.ForeignKey(Object, related_name="chan_owner")
|
||||||
description = models.CharField(max_length=80)
|
description = models.CharField(max_length=80)
|
||||||
req_grp = models.ManyToManyField(Group, blank=True, null=True)
|
req_grp = models.ManyToManyField(Group, blank=True, null=True)
|
||||||
|
|
||||||
|
objects = CommChannelManager()
|
||||||
|
|
||||||
def __str__(self):
|
def __str__(self):
|
||||||
return "%s" % (self.name,)
|
return "%s" % (self.name,)
|
||||||
|
|
@ -870,6 +876,8 @@ class CommChannelMessage(models.Model):
|
||||||
channel = models.ForeignKey(CommChannel, related_name="msg_channel")
|
channel = models.ForeignKey(CommChannel, related_name="msg_channel")
|
||||||
message = models.CharField(max_length=255)
|
message = models.CharField(max_length=255)
|
||||||
date_sent = models.DateTimeField(editable=False, auto_now_add=True)
|
date_sent = models.DateTimeField(editable=False, auto_now_add=True)
|
||||||
|
|
||||||
|
objects = CommChannelManager()
|
||||||
|
|
||||||
def __str__(self):
|
def __str__(self):
|
||||||
return "%s: %s" % (self.sender.name, self.message)
|
return "%s: %s" % (self.sender.name, self.message)
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue