Merge branch 'master' into develop

evennia/commands/default/admin.py

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

evennia/commands/default/building.py

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

evennia/comms/admin.py

@@ -53,10 +53,11 @@ class ChannelAdmin(admin.ModelAdmin):
     list_display = ('id', 'db_key', 'db_lock_storage', "subscriptions")
     list_display_links = ("id", '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_on_top = True
     list_select_related = True
+    raw_id_fields = ('db_object_subscriptions', 'db_account_subscriptions',)
     fieldsets = (
         (None, {'fields': (('db_key',), 'db_lock_storage', 'db_account_subscriptions', 'db_object_subscriptions')}),
     )

evennia/server/portal/ssl.py

@@ -13,8 +13,13 @@ try:
 except ImportError as error:
     errstr = """
     {err}
-    SSL requires the PyOpenSSL library:
-        pip install pyopenssl
+    SSL requires the PyOpenSSL library and dependencies:
+
+        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))
 

evennia/settings_default.py

@@ -636,8 +636,6 @@ RSS_UPDATE_INTERVAL = 60 * 10  # 10 minutes
 # browser to display. Note however that this will leak memory when
 # active, so make sure to turn it off for a production server!
 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
 # rather prefer nobody receives emails, leave this commented out or empty.
 ADMINS = ()  # 'Your Name', 'your_email@domain.com'),)
@@ -730,7 +728,9 @@ TEMPLATES = [{
             'django.template.context_processors.media',
             'django.template.context_processors.debug',
             '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
     }
 }]