From 43f0ae6af6c77e54c88a41f5aa90f23627261dac Mon Sep 17 00:00:00 2001 From: Greg Taylor Date: Sun, 15 Jun 2008 03:01:58 +0000 Subject: [PATCH] Outlining managers. I know some of these managers sub-modules only have one file in them, but let's keep the convention for consistency. --- apps/config/managers/__init__.py | 0 apps/config/managers/commandalias.py | 8 ++++++++ apps/config/managers/configvalue.py | 8 ++++++++ apps/config/managers/connectscreen.py | 17 +++++++++++++++++ apps/config/models.py | 21 +++++++-------------- apps/helpsys/managers/helpentry.py | 8 ++++++++ apps/helpsys/models.py | 5 ++++- apps/objects/managers/__init__.py | 0 apps/objects/managers/commchannel.py | 8 ++++++++ apps/objects/models.py | 8 ++++++++ 10 files changed, 68 insertions(+), 15 deletions(-) create mode 100644 apps/config/managers/__init__.py create mode 100644 apps/config/managers/commandalias.py create mode 100644 apps/config/managers/configvalue.py create mode 100644 apps/config/managers/connectscreen.py create mode 100644 apps/helpsys/managers/helpentry.py create mode 100644 apps/objects/managers/__init__.py create mode 100644 apps/objects/managers/commchannel.py diff --git a/apps/config/managers/__init__.py b/apps/config/managers/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/apps/config/managers/commandalias.py b/apps/config/managers/commandalias.py new file mode 100644 index 0000000000..bf7750ee05 --- /dev/null +++ b/apps/config/managers/commandalias.py @@ -0,0 +1,8 @@ +""" +Custom manager for CommandAlias objects. +""" +from django.db import models + +class CommandAliasManager(models.Manager): + pass + diff --git a/apps/config/managers/configvalue.py b/apps/config/managers/configvalue.py new file mode 100644 index 0000000000..bb154554c9 --- /dev/null +++ b/apps/config/managers/configvalue.py @@ -0,0 +1,8 @@ +""" +Custom manager for ConfigValue objects. +""" +from django.db import models + +class ConfigValueManager(models.Manager): + pass + diff --git a/apps/config/managers/connectscreen.py b/apps/config/managers/connectscreen.py new file mode 100644 index 0000000000..2c20ebe7df --- /dev/null +++ b/apps/config/managers/connectscreen.py @@ -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 diff --git a/apps/config/models.py b/apps/config/models.py index 044be567fc..fbaf708d2e 100755 --- a/apps/config/models.py +++ b/apps/config/models.py @@ -1,4 +1,7 @@ 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): """ @@ -8,6 +11,8 @@ class CommandAlias(models.Model): user_input = models.CharField(max_length=50) equiv_command = models.CharField(max_length=50) + objects = CommandAliasManager() + class Admin: list_display = ('user_input', 'equiv_command',) @@ -22,22 +27,11 @@ class ConfigValue(models.Model): conf_key = models.CharField(max_length=100) conf_value = models.TextField() + objects = ConfigValueManager() + class Admin: 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): """ 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.") is_active = models.BooleanField(default=1, help_text="Only active connect screens are placed in the rotation") - # Custom manager objects = ConnectScreenManager() class Admin: diff --git a/apps/helpsys/managers/helpentry.py b/apps/helpsys/managers/helpentry.py new file mode 100644 index 0000000000..f5e9fbcf01 --- /dev/null +++ b/apps/helpsys/managers/helpentry.py @@ -0,0 +1,8 @@ +""" +Custom manager for HelpEntry objects. +""" +from django.db import models + +class HelpEntryManager(models.Manager): + pass + diff --git a/apps/helpsys/models.py b/apps/helpsys/models.py index 6c9c90d5c3..5d88f76204 100644 --- a/apps/helpsys/models.py +++ b/apps/helpsys/models.py @@ -1,5 +1,6 @@ -from django.db import models import ansi +from django.db import models +from apps.helpsys.managers.helpentry import HelpEntryManager class HelpEntry(models.Model): """ @@ -8,6 +9,8 @@ class HelpEntry(models.Model): topicname = models.CharField(max_length=255) entrytext = models.TextField(blank=True, null=True) staff_only = models.BooleanField(default=0) + + objects = HelpEntryManager() class Admin: list_display = ('id', 'topicname', 'staff_only') diff --git a/apps/objects/managers/__init__.py b/apps/objects/managers/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/apps/objects/managers/commchannel.py b/apps/objects/managers/commchannel.py new file mode 100644 index 0000000000..b23209bb62 --- /dev/null +++ b/apps/objects/managers/commchannel.py @@ -0,0 +1,8 @@ +""" +Custom manager for CommChannel objects. +""" +from django.db import models + +class CommChannelManager(models.Manager): + pass + diff --git a/apps/objects/models.py b/apps/objects/models.py index a8d04d62cd..56f741da55 100755 --- a/apps/objects/models.py +++ b/apps/objects/models.py @@ -7,6 +7,8 @@ import scripthandler import defines_global import gameconf import ansi +from apps.objects.managers.commchannel import CommChannelManager +from apps.objects.managers.object import ObjectManager class Attribute(models.Model): """ @@ -101,6 +103,8 @@ class Object(models.Model): nosave_flags = models.TextField(blank=True, null=True) date_created = models.DateField(editable=False, auto_now_add=True) scriptlink = None + + objects = ObjectManager() def __cmp__(self, other): """ @@ -809,6 +813,8 @@ class CommChannel(models.Model): owner = models.ForeignKey(Object, related_name="chan_owner") description = models.CharField(max_length=80) req_grp = models.ManyToManyField(Group, blank=True, null=True) + + objects = CommChannelManager() def __str__(self): return "%s" % (self.name,) @@ -870,6 +876,8 @@ class CommChannelMessage(models.Model): channel = models.ForeignKey(CommChannel, related_name="msg_channel") message = models.CharField(max_length=255) date_sent = models.DateTimeField(editable=False, auto_now_add=True) + + objects = CommChannelManager() def __str__(self): return "%s: %s" % (self.sender.name, self.message)