Annikka/evennia
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #1496 from chainsol/fix_admin_channel

Browse source 
Fix Admin page for Channel objects
This commit is contained in:
Griatch 2017-10-29 09:42:33 +01:00 • committed by GitHub
commit 35b88d45f9
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
evennia/commands/default/comms.py
View file

@ -417,7 +417,7 @@ class CmdCBoot(COMMAND_DEFAULT_CLASS):
string = "You don't control this channel." string = "You don't control this channel."
self.msg(string) self.msg(string)
return 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) string = "Account %s is not connected to channel %s." % (account.key, channel.key)
self.msg(string) self.msg(string)
return return

4
evennia/comms/admin.py
View file

@ -58,7 +58,7 @@ class ChannelAdmin(admin.ModelAdmin):
save_on_top = True save_on_top = True
list_select_related = True list_select_related = True
fieldsets = ( 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): def subscriptions(self, obj):
@ -69,7 +69,7 @@ class ChannelAdmin(admin.ModelAdmin):
obj (Channel): The channel to get subs from. 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): def save_model(self, request, obj, form, change):
""" """