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

cleanup

Browse source
This commit is contained in:
davewiththenicehat 2021-06-05 21:18:49 -04:00
parent 3bcdff2c34
commit 4cd721ad79
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

5
evennia/help/filehelp.py
View file

@ -74,7 +74,6 @@ from evennia.utils.utils import (
from evennia.utils import logger from evennia.utils import logger
from evennia.utils.utils import lazy_property from evennia.utils.utils import lazy_property
from evennia.locks.lockhandler import LockHandler from evennia.locks.lockhandler import LockHandler
from evennia.utils.logger import log_info
_DEFAULT_HELP_CATEGORY = settings.DEFAULT_HELP_CATEGORY _DEFAULT_HELP_CATEGORY = settings.DEFAULT_HELP_CATEGORY
@ -145,14 +144,12 @@ class FileHelpEntry:
path (str): URI path to object detail page, if defined. path (str): URI path to object detail page, if defined.
""" """
# log_info('filehelp web_get_detail_url start')
try: try:
return reverse( return reverse(
'help-entry-detail', 'help-entry-detail',
kwargs={"category": slugify(self.help_category), "topic": slugify(self.key)}, kwargs={"category": slugify(self.help_category), "topic": slugify(self.key)},
) )
except Exception as e: except Exception:
log_info(f'Exception: {getattr(e, "message", repr(e))}')
return "#" return "#"
def access(self, accessing_obj, access_type="view", default=True): def access(self, accessing_obj, access_type="view", default=True):

5
evennia/help/models.py
View file

@ -19,7 +19,6 @@ from evennia.help.manager import HelpEntryManager
from evennia.typeclasses.models import Tag, TagHandler, AliasHandler from evennia.typeclasses.models import Tag, TagHandler, AliasHandler
from evennia.locks.lockhandler import LockHandler from evennia.locks.lockhandler import LockHandler
from evennia.utils.utils import lazy_property from evennia.utils.utils import lazy_property
from evennia.utils.logger import log_info
__all__ = ("HelpEntry",) __all__ = ("HelpEntry",)
@ -57,9 +56,11 @@ class HelpEntry(SharedMemoryModel):
db_key = models.CharField( db_key = models.CharField(
"help key", max_length=255, unique=True, help_text="key to search for" "help key", max_length=255, unique=True, help_text="key to search for"
) )
@lazy_property @lazy_property
def key(self): def key(self):
return self.db_key return self.db_key
# help category # help category
db_help_category = models.CharField( db_help_category = models.CharField(
"help category", "help category",
@ -67,9 +68,11 @@ class HelpEntry(SharedMemoryModel):
default="General", default="General",
help_text="organizes help entries in lists", help_text="organizes help entries in lists",
) )
@lazy_property @lazy_property
def help_category(self): def help_category(self):
return self.db_help_category return self.db_help_category
# the actual help entry text, in any formatting. # the actual help entry text, in any formatting.
db_entrytext = models.TextField( db_entrytext = models.TextField(
"help entry", blank=True, help_text="the main body of help text" "help entry", blank=True, help_text="the main body of help text"