From e1db190329469902e3d2a291cb4521def5728a5d Mon Sep 17 00:00:00 2001 From: Nicholas Matlaga Date: Fri, 27 Oct 2017 14:10:19 -0400 Subject: [PATCH] change references to db_subscriptions to reference handler correctly --- evennia/commands/default/comms.py | 2 +- evennia/comms/admin.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/evennia/commands/default/comms.py b/evennia/commands/default/comms.py index 53e047a2ac..37a4934d16 100644 --- a/evennia/commands/default/comms.py +++ b/evennia/commands/default/comms.py @@ -417,7 +417,7 @@ class CmdCBoot(COMMAND_DEFAULT_CLASS): string = "You don't control this channel." self.msg(string) return - if account not in channel.db_subscriptions.all(): + if not channel.subscriptions.has(account): string = "Account %s is not connected to channel %s." % (account.key, channel.key) self.msg(string) return diff --git a/evennia/comms/admin.py b/evennia/comms/admin.py index 29a02507c1..52ed7993fd 100644 --- a/evennia/comms/admin.py +++ b/evennia/comms/admin.py @@ -58,7 +58,7 @@ class ChannelAdmin(admin.ModelAdmin): save_on_top = True list_select_related = True fieldsets = ( - (None, {'fields': (('db_key',), 'db_lock_storage', 'db_subscriptions')}), + (None, {'fields': (('db_key',), 'db_lock_storage', 'db_account_subscriptions', 'db_object_subscriptions')}), ) def subscriptions(self, obj): @@ -69,7 +69,7 @@ class ChannelAdmin(admin.ModelAdmin): obj (Channel): The channel to get subs from. """ - return ", ".join([str(sub) for sub in obj.db_subscriptions.all()]) + return ", ".join([str(sub) for sub in obj.subscriptions.all()]) def save_model(self, request, obj, form, change): """