From 4e4465f2539d40dc05f3ffb82477fd1e9fc4078f Mon Sep 17 00:00:00 2001
From: Renaud Le Gac <renaud.legac@free.fr>
Date: Fri, 10 Dec 2010 18:23:18 +0000
Subject: [PATCH] Define properly the collaboration field.
---
models/db_defaults.py | 6 +++---
models/db_widgets.py | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/models/db_defaults.py b/models/db_defaults.py
index a2551d07..71ff3c24 100644
--- a/models/db_defaults.py
+++ b/models/db_defaults.py
@@ -13,9 +13,9 @@ if not db(db.categories_aeres.id).count():
if not db(db.collaborations.id).count():
db.collaborations.insert(id=1, collaboration=T('undefined'))
- db.collaborations.insert(collaboration='Atlas')
- db.collaborations.insert(collaboration='H1')
- db.collaborations.insert(collaboration='LHCb')
+ db.collaborations.insert(collaboration='Atlas Collaboration')
+ db.collaborations.insert(collaboration='H1 Collaboration')
+ db.collaborations.insert(collaboration='LHCb Collaboration')
if not db(db.countries.id).count():
diff --git a/models/db_widgets.py b/models/db_widgets.py
index 715d1d9d..763bcd41 100644
--- a/models/db_widgets.py
+++ b/models/db_widgets.py
@@ -113,7 +113,7 @@ pgm.customize_form('publications',
# add a template column handling general information
tpl = ['{PublicationsTitle}<br>',
'{PublicationsAuthors}',
- '<tpl if="PublicationsId_collaborations > 1">, {CollaborationsCollaboration} Collaboration</tpl>',
+ '<tpl if="PublicationsId_collaborations > 1">, {CollaborationsCollaboration}</tpl>',
'<tpl if="PublicationsDoi"><br>{PublicationsDoi}</tpl>',
'<tpl if="PublicationsId_publishers > 1"><br>{PublishersAbbreviation}',
'<tpl if="PublicationsVolume"> {PublicationsVolume}</tpl>',
--
GitLab