Skip to content

GitLab

Docker-in-Docker (DinD) capabilities of public runners deactivated. More info

Commit 9fef7986 authored by LE GAC Renaud's avatar LE GAC Renaud
Browse files

Update model_selector and ui_viewport to fix minor issues.

parent 2003ca58
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 4 deletions
modules/model_selector.py
View file @ 9fef7986
......@@ -263,6 +263,7 @@ class Selector(object):
"""
mode_dry_run = T(DRY_RUN)
year = current.request.now.year
table = virtdb.define_table(
......@@ -276,7 +277,7 @@ class Selector(object):
Field("format", "string", default="html", label="Report format"))
table.format.requires = IS_IN_SET(["html", "pdf", "tex"])
table.mode.requires = IS_IN_SET([mode_dry_run, MODE_LOAD_IN_DB])
table.mode.requires = IS_IN_SET([mode_dry_run, T(MODE_LOAD_IN_DB)])
table.id_projects.requires = IS_IN_DB(db, "projects.project")
table.id_teams.requires = IS_IN_DB(db, "teams.team")
......@@ -364,7 +365,7 @@ class Selector(object):
table.id_categories.requires = IS_IN_DB(db, "categories.code")
table.id_projects.requires = IS_IN_DB(db, "projects.project")
table.id_teams.requires = IS_IN_DB(db, "teams.team")
table.mode.requires = IS_IN_SET([mode_dry_run, MODE_LOAD_IN_DB])
table.mode.requires = IS_IN_SET([mode_dry_run, T(MODE_LOAD_IN_DB)])
table.xml.requires = IS_MATCH("<\?xml*")
return table
......@@ -435,7 +436,7 @@ class Selector(object):
Field("format", "string", default="html", label="Report format"))
table.format.requires = IS_IN_SET(["html", "pdf", "tex"])
table.mode.requires = IS_IN_SET([mode_dry_run, MODE_LOAD_IN_DB])
table.mode.requires = IS_IN_SET([mode_dry_run, T(MODE_LOAD_IN_DB)])
table.id_projects.requires = IS_IN_DB(db, "projects.project")
table.id_teams.requires = IS_IN_DB(db, "teams.team")
......
modules/ui_viewport.py
View file @ 9fef7986
......@@ -343,7 +343,8 @@ class ViewportUi(object):
loader = dict(
autoLoad=True,
renderer="html",
url=URL("plugin_dbui", "documentations_list"))
scripts=True,
url=URL("plugin_dbui", "documentations_table"))
doc_panel = Panel(
loader=loader,
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment