Commit 37a7030f authored by LE GAC Renaud's avatar LE GAC Renaud
Browse files

Bugs fixed.

parent 102c190a
......@@ -28,7 +28,10 @@ def free_run():
for el in fields:
if not selector[el]:
return T('All fields of the form have to be defined !!!')
msg = T('All fields of the form have to be defined !!!')
msg += "<br>"
msg += T('The field "%s" is missing.') % el
return msg
tool_class = get_harvester_tool(selector.controller)
tool = tool_class(selector, debug=False)
......
......@@ -398,6 +398,7 @@
'Temps': 'Temps',
'The "query" is a condition like "db.table1.field1==\'value\'". Something like "db.table1.field1==db.table2.field2" results in a SQL JOIN.': 'The "query" is a condition like "db.table1.field1==\'value\'". Something like "db.table1.field1==db.table2.field2" results in a SQL JOIN.',
'The cppm authors contains the team name?': "Le champ autheurs du CPPM contiens le nom de l'équipe ?",
'The field "%s" is missing.': 'Le champ "%s" est manquant.',
'The name of the first author: J. Doe': 'Nom du premier auteur : J. Doe',
'The name of the speaker: P.-Y. Smith': "Nom de l'orateur : P.-Y. Smith",
'The name of the web2py controller running the search: articles, proceedings,...': 'Nom du controller web2py qui effectut la recherche : articles, proceedings,...',
......
......@@ -16,17 +16,17 @@ ID_USER, USER, DEF_USER = 2, 'user', 'liaisons, team leaders,...'
# MYSQL database
#
#-------------------------------------------------------------------------------
# try:
# db = DAL(DB_MYSQL, migrate_enabled=MIGRATE, pool_size=10)
# except:
# raise HTTP(500, T("Can't access the MySQL database !!!"))
try:
db = DAL(DB_MYSQL, migrate_enabled=MIGRATE, pool_size=10)
except:
raise HTTP(500, T("Can't access the MySQL database !!!"))
#-------------------------------------------------------------------------------
#
# SQLITE database (test)
#
#-------------------------------------------------------------------------------
db = DAL('sqlite://storage.sqlite', migrate_enabled=MIGRATE)
# db = DAL('sqlite://storage.sqlite', migrate_enabled=MIGRATE)
#-------------------------------------------------------------------------------
#
......
......@@ -62,8 +62,7 @@ formModifier.link_comboboxes(master=virtdb.free_harvester_selector.id_projects,
# Relation between harvester controller and publication categories
formModifier.link_comboboxes(master=virtdb.free_harvester_selector.controller,
slave=virtdb.free_harvester_selector.id_categories,
masterHasSlaveData='controllers',
slaveExtJS={'hidden': True})
masterHasSlaveData='controllers')
formModifier.hide_fields('ratio')
......
......@@ -172,8 +172,8 @@ viewportModifier.add_node(helpNode, casNode, wizardNode, confNode, gridNode, rep
# NOTE the session.auth only exit when the user is logged
if "auth" in globals():
viewportModifier.append_plugins('pViewportLogin')
viewportModifier.configure(logged=False)
viewportModifier.configure(logged=False,
plugins=['pViewportLogin'])
if session.role in (ADMIN, USER):
viewportModifier.configure(logged=True)
......
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