From 9648af652165d44878d92b62e0640558f4d2c441 Mon Sep 17 00:00:00 2001 From: Michael King Date: Mon, 11 Jun 2007 14:48:57 +0000 Subject: [PATCH] Added settings.py to svn:ignore Merged in updates to branch --- cmdtable.py | 1 + commands/objmanip.py | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/cmdtable.py b/cmdtable.py index bd2c003470..cdad3606ac 100644 --- a/cmdtable.py +++ b/cmdtable.py @@ -47,6 +47,7 @@ ctable = { "uptime": (commands.general.cmd_uptime, None), "version": (commands.general.cmd_version, None), "who": (commands.general.cmd_who, None), + "@alias": (commands.objmanip.cmd_alias, None), "@ccreate": (commands.comsys.cmd_ccreate, ("objects.add_commchannel")), "@cdestroy": (commands.comsys.cmd_cdestroy, ("objects.delete_commchannel")), "@cemit": (commands.comsys.cmd_cemit, None), diff --git a/commands/objmanip.py b/commands/objmanip.py index 87f8e65c0f..757ef164f0 100644 --- a/commands/objmanip.py +++ b/commands/objmanip.py @@ -105,7 +105,7 @@ def cmd_alias(cdat): session.msg("Alias whom?") return - duplicates = Attributes.objects.filter(attr_name="ALIAS").filter(attr_value=eq_args[1]) + duplicates = Attribute.objects.filter(attr_name="ALIAS").filter(attr_value=eq_args[1]) if duplicates: session.msg("Alias already exists.") @@ -542,4 +542,4 @@ def cmd_destroy(cdat): return session.msg("You destroy %s." % (target_obj.get_name(),)) - target_obj.destroy() \ No newline at end of file + target_obj.destroy()