Added settings.py to svn:ignore
Merged in updates to branch
This commit is contained in:
parent
1d14834a3b
commit
9648af6521
2 changed files with 3 additions and 2 deletions
|
|
@ -47,6 +47,7 @@ ctable = {
|
||||||
"uptime": (commands.general.cmd_uptime, None),
|
"uptime": (commands.general.cmd_uptime, None),
|
||||||
"version": (commands.general.cmd_version, None),
|
"version": (commands.general.cmd_version, None),
|
||||||
"who": (commands.general.cmd_who, None),
|
"who": (commands.general.cmd_who, None),
|
||||||
|
"@alias": (commands.objmanip.cmd_alias, None),
|
||||||
"@ccreate": (commands.comsys.cmd_ccreate, ("objects.add_commchannel")),
|
"@ccreate": (commands.comsys.cmd_ccreate, ("objects.add_commchannel")),
|
||||||
"@cdestroy": (commands.comsys.cmd_cdestroy, ("objects.delete_commchannel")),
|
"@cdestroy": (commands.comsys.cmd_cdestroy, ("objects.delete_commchannel")),
|
||||||
"@cemit": (commands.comsys.cmd_cemit, None),
|
"@cemit": (commands.comsys.cmd_cemit, None),
|
||||||
|
|
|
||||||
|
|
@ -105,7 +105,7 @@ def cmd_alias(cdat):
|
||||||
session.msg("Alias whom?")
|
session.msg("Alias whom?")
|
||||||
return
|
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:
|
if duplicates:
|
||||||
session.msg("Alias already exists.")
|
session.msg("Alias already exists.")
|
||||||
|
|
@ -542,4 +542,4 @@ def cmd_destroy(cdat):
|
||||||
return
|
return
|
||||||
|
|
||||||
session.msg("You destroy %s." % (target_obj.get_name(),))
|
session.msg("You destroy %s." % (target_obj.get_name(),))
|
||||||
target_obj.destroy()
|
target_obj.destroy()
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue