Andreas/evennia
1
0
Fork 0
mirror of https://github.com/evennia/evennia.git synced 2026-03-21 07:16:31 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Tidying up the admin interface by adding more verbose and helpful names to database fields as well as adding more help texts. The ObjectAdmin still gives tracebacks.

Browse source
This commit is contained in:
Griatch 2011-10-02 01:21:03 +02:00
parent 6ae1123421
commit 7f2e6dd4fa
11 changed files with 137 additions and 80 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/scripts/admin.py
View file

@ -20,4 +20,10 @@ class ScriptDBAdmin(admin.ModelAdmin):
save_as = True
save_on_top = True
list_select_related = True
fieldsets = (
(None, {
'fields':(('db_key', 'db_typeclass_path'), 'db_interval', 'db_repeats', 'db_start_delay', 'db_persistent', 'db_obj')}),
)
admin.site.register(ScriptDB, ScriptDBAdmin)

18
src/scripts/models.py
View file

@ -37,7 +37,7 @@ from src.scripts.manager import ScriptManager
class ScriptAttribute(Attribute):
"Attributes for ScriptDB objects."
db_obj = models.ForeignKey("ScriptDB")
db_obj = models.ForeignKey("ScriptDB", verbose_name='script')
class Meta:
"Define Django meta options"
@ -88,19 +88,20 @@ class ScriptDB(TypedObject):
# db_key, db_typeclass_path, db_date_created, db_permissions
# optional description.
db_desc = models.CharField(max_length=255, blank=True)
db_desc = models.CharField('desc', max_length=255, blank=True)
# A reference to the database object affected by this Script, if any.
db_obj = models.ForeignKey("objects.ObjectDB", null=True, blank=True)
db_obj = models.ForeignKey("objects.ObjectDB", null=True, blank=True, verbose_name='scripted object',
help_text='the object to store this script on, if not a global script.')
# how often to run Script (secs). -1 means there is no timer
db_interval = models.IntegerField(default=-1)
db_interval = models.IntegerField('interval', default=-1, help_text='how often to repeat script, in seconds. -1 means off.')
# start script right away or wait interval seconds first
db_start_delay = models.BooleanField(default=False)
db_start_delay = models.BooleanField('start delay', default=False, help_text='pause interval seconds before starting.')
# how many times this script is to be repeated, if interval!=0.
db_repeats = models.IntegerField(default=0)
db_repeats = models.IntegerField('number of repeats', default=0, help_text='0 means off.')
# defines if this script should survive a reboot or not
db_persistent = models.BooleanField(default=False)
db_persistent = models.BooleanField('survive server reboot', default=False)
# defines if this script has already been started in this session
db_is_active = models.BooleanField(default=False)
db_is_active = models.BooleanField('script active', default=False)
# Database manager
objects = ScriptManager()
@ -108,7 +109,6 @@ class ScriptDB(TypedObject):
class Meta:
"Define Django meta options"
verbose_name = "Script"
verbose_name_plural = "Scripts"
# Wrapper properties to easily set database fields. These are
# @property decorators that allows to access these fields using