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

Merge branch 'master' into develop

Browse source
This commit is contained in:
Griatch 2017-12-05 17:14:25 +01:00
commit 13ebf768db
5 changed files with 16 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -301,7 +301,7 @@ class CmdDelAccount(COMMAND_DEFAULT_CLASS):
# one single match # one single match
account = accounts.pop() account = accounts.first()
if not account.access(caller, 'delete'): if not account.access(caller, 'delete'):
string = "You don't have the permissions to delete that account." string = "You don't have the permissions to delete that account."

6
evennia/commands/default/building.py
View file

@ -1087,7 +1087,7 @@ class CmdSetHome(CmdLink):
set an object's home location set an object's home location
Usage: Usage:
@home <obj> [= <home_location>] @sethome <obj> [= <home_location>]
The "home" location is a "safety" location for objects; they The "home" location is a "safety" location for objects; they
will be moved there if their current location ceases to exist. All will be moved there if their current location ceases to exist. All
@ -1098,13 +1098,13 @@ class CmdSetHome(CmdLink):
""" """
key = "@sethome" key = "@sethome"
locks = "cmd:perm(@home) or perm(Builder)" locks = "cmd:perm(@sethome) or perm(Builder)"
help_category = "Building" help_category = "Building"
def func(self): def func(self):
"""implement the command""" """implement the command"""
if not self.args: if not self.args:
string = "Usage: @home <obj> [= <home_location>]" string = "Usage: @sethome <obj> [= <home_location>]"
self.caller.msg(string) self.caller.msg(string)
return return

3
evennia/comms/admin.py
View file

@ -53,10 +53,11 @@ class ChannelAdmin(admin.ModelAdmin):
list_display = ('id', 'db_key', 'db_lock_storage', "subscriptions") list_display = ('id', 'db_key', 'db_lock_storage', "subscriptions")
list_display_links = ("id", 'db_key') list_display_links = ("id", 'db_key')
ordering = ["db_key"] ordering = ["db_key"]
search_fields = ['id', 'db_key', 'db_aliases'] search_fields = ['id', 'db_key', 'db_tags__db_key']
save_as = True save_as = True
save_on_top = True save_on_top = True
list_select_related = True list_select_related = True
raw_id_fields = ('db_object_subscriptions', 'db_account_subscriptions',)
fieldsets = ( fieldsets = (
(None, {'fields': (('db_key',), 'db_lock_storage', 'db_account_subscriptions', 'db_object_subscriptions')}), (None, {'fields': (('db_key',), 'db_lock_storage', 'db_account_subscriptions', 'db_object_subscriptions')}),
) )

9
evennia/server/portal/ssl.py
View file

@ -13,8 +13,13 @@ try:
except ImportError as error: except ImportError as error:
errstr = """ errstr = """
{err} {err}
SSL requires the PyOpenSSL library: SSL requires the PyOpenSSL library and dependencies:
pip install pyopenssl
pip install pyopenssl pycrypto enum pyasn1 service_identity
Stop and start Evennia again. If no certificate can be generated, you'll
get a suggestion for a (linux) command to generate this locally.
""" """
raise ImportError(errstr.format(err=error)) raise ImportError(errstr.format(err=error))

6
evennia/settings_default.py
View file

@ -636,8 +636,6 @@ RSS_UPDATE_INTERVAL = 60 * 10 # 10 minutes
# browser to display. Note however that this will leak memory when # browser to display. Note however that this will leak memory when
# active, so make sure to turn it off for a production server! # active, so make sure to turn it off for a production server!
DEBUG = False DEBUG = False
# While true, show "pretty" error messages for template syntax errors.
TEMPLATE_DEBUG = DEBUG
# Emails are sent to these people if the above DEBUG value is False. If you'd # Emails are sent to these people if the above DEBUG value is False. If you'd
# rather prefer nobody receives emails, leave this commented out or empty. # rather prefer nobody receives emails, leave this commented out or empty.
ADMINS = () # 'Your Name', 'your_email@domain.com'),) ADMINS = () # 'Your Name', 'your_email@domain.com'),)
@ -730,7 +728,9 @@ TEMPLATES = [{
'django.template.context_processors.media', 'django.template.context_processors.media',
'django.template.context_processors.debug', 'django.template.context_processors.debug',
'sekizai.context_processors.sekizai', 'sekizai.context_processors.sekizai',
'evennia.web.utils.general_context.general_context'] 'evennia.web.utils.general_context.general_context'],
# While true, show "pretty" error messages for template syntax errors.
"debug": DEBUG
} }
}] }]