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

Merge branch 'issue-2461' of https://github.com/GulliblePsychologist/evennia into GulliblePsychologist-issue-2461

Browse source
This commit is contained in:
Griatch 2021-07-26 22:12:14 +02:00
commit 6e94d16ac2
3 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
evennia/web/admin/accounts.py
View file

@ -58,8 +58,8 @@ class AccountChangeForm(UserChangeForm):
label="Typeclass", label="Typeclass",
help_text="This is the Python-path to the class implementing the actual account functionality. " help_text="This is the Python-path to the class implementing the actual account functionality. "
"You usually don't need to change this from the default.<BR>" "You usually don't need to change this from the default.<BR>"
"If your custom class is not found here, it may not be imported as part of Evennia's startup.", "If your custom class is not found here, it may not be imported into Evennia yet.",
choices=adminutils.get_and_load_typeclasses(parent=AccountDB), choices=lambda: adminutils.get_and_load_typeclasses(parent=AccountDB),
) )
db_lock_storage = forms.CharField( db_lock_storage = forms.CharField(

4
evennia/web/admin/objects.py
View file

@ -63,8 +63,8 @@ class ObjectCreateForm(forms.ModelForm):
help_text="This is the Python-path to the class implementing the actual functionality. " help_text="This is the Python-path to the class implementing the actual functionality. "
f"<BR>If you are creating a Character you usually need <B>{settings.BASE_CHARACTER_TYPECLASS}</B> " f"<BR>If you are creating a Character you usually need <B>{settings.BASE_CHARACTER_TYPECLASS}</B> "
"or a subclass of that. <BR>If your custom class is not found in the list, it may not be imported " "or a subclass of that. <BR>If your custom class is not found in the list, it may not be imported "
"as part of Evennia's startup.", "into Evennia yet.",
choices=adminutils.get_and_load_typeclasses(parent=ObjectDB)) choices=lambda: adminutils.get_and_load_typeclasses(parent=ObjectDB))
db_lock_storage = forms.CharField( label="Locks", db_lock_storage = forms.CharField( label="Locks",
required=False, required=False,

4
evennia/web/admin/scripts.py
View file

@ -22,8 +22,8 @@ class ScriptForm(forms.ModelForm):
db_typeclass_path = forms.ChoiceField( db_typeclass_path = forms.ChoiceField(
label="Typeclass", label="Typeclass",
help_text="This is the Python-path to the class implementing the actual script functionality. " help_text="This is the Python-path to the class implementing the actual script functionality. "
"<BR>If your custom class is not found here, it may not be imported as part of Evennia's startup.", "<BR>If your custom class is not found here, it may not be imported into Evennia yet.",
choices=adminutils.get_and_load_typeclasses( choices=lambda: adminutils.get_and_load_typeclasses(
parent=ScriptDB, excluded_parents=["evennia.prototypes.prototypes.DbPrototype"]) parent=ScriptDB, excluded_parents=["evennia.prototypes.prototypes.DbPrototype"])
) )