Commit de950f17 authored by LE GAC Renaud's avatar LE GAC Renaud
Browse files

Bug fixed in the harvester form (missing category field)

parent 4c1b4a20
......@@ -112,7 +112,7 @@
'Configure rapports': 'Configurer les rapports',
'Configure the application': "Configurer l'application",
'contains': 'contiens',
'Controller': 'Controller',
'Controller': 'Controlleur',
'controllers': 'contrôleurs',
'Converters': 'Convertisseurs',
'Copyright': 'Copyright',
......@@ -376,6 +376,7 @@
'Reject preprint is a thesis': 'Rejeté ce preprint est une thèse',
'Reject the talk match a proceeding': 'Rejeté cette présentation correspond à un actes de conférence',
'Rejected': 'Rejeté',
'Relation controller / categories': 'Relation controlleur / catégories',
'Relation team / projects': 'Relation équipe / projets',
'relation user / groups': 'relation utilisateur / groupes',
'Removing affiliation failed. Rules might be missing for the given string. Contact the author.': 'Removing affiliation failed. Rules might be missing for the given string. Contact the author.',
......@@ -432,7 +433,7 @@
'Statistics': 'Statistique',
'Status': 'Status',
'status': 'status',
'Store': 'Entrepot',
'Store': 'Entrepôt',
'String containing blabla and the database fields to be displayed. The substitution mechanism is: {tablename.fieldname} or {foreigntablename.fieldname}': 'String containing blabla and the database fields to be displayed. The substitution mechanism is: {tablename.fieldname} or {foreigntablename.fieldname}',
'String containing the author names with their institutes number.': 'Chaîne de caractère contenant le nom des auteurs avec le numéro de leurs instituts.',
'Submitted': 'Soumis',
......
......@@ -19,9 +19,9 @@ db.define_table("harvesters",
Field("id_projects", "reference projects", label='Project', notnull=True),
Field("controller", "string", length=255, comment=tp_controller, label='Harvest', notnull=True),
Field("host", "string", length=255, comment=tp_host, default='cds.cern.ch', label='Store', notnull=True),
Field("collections", "string", length=255, comment=tp_collections, default=""),
Field("collections", "string", length=255, comment=tp_collections, notnull=True),
Field("ratio", "double", comment=tp_ratio, default=1.0, notnull=True),
Field("id_categories", "reference categories", comment=tp_category, default=undef_id, label='Category'),
Field("id_categories", "reference categories", comment=tp_category, label='Category', notnull=True),
migrate="harvesters.table")
db.harvesters.collections.filter_in = dbui.CLEAN_SPACES
......
......@@ -29,7 +29,7 @@ formModifier.link_comboboxes(master=db.harvesters.id_projects,
formModifier.link_comboboxes(master=db.harvesters.controller,
slave=db.harvesters.id_categories,
masterHasSlaveData='controllers',
slaveExtJS={'hidden': True})
slaveExtJS={'hidden': False})
formModifier.configure(width=350)
......
......@@ -43,7 +43,7 @@ if session.role == ADMIN:
confHarvesterNode = None
if session.role in (ADMIN, USER):
leaves = ('controllers', 'cppm_authors', 'harvesters')
leaves = ('cppm_authors', 'harvesters')
if session.role == USER:
leaves = ('cppm_authors', 'harvesters')
......@@ -51,6 +51,8 @@ if session.role in (ADMIN, USER):
confHarvesterNode = Node(T('Configure harvesters'))
confHarvesterNode.add_children(leaves, func=to_grid)
confHarvesterNode.add_child(T('Relation controller / categories'), to_grid('controllers'))
#-------------------------------------------------------------------------------
#
# CONFIGURE LISTS
......
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