Commit 8784bc08 authored by LE GAC Renaud's avatar LE GAC Renaud
Browse files

Merge branch '81-migrate-dbui-0.9.8.1' into 'master'

Resolve "Migrate to plugin_dbui 0.9.8.1"

Closes #81

See merge request !81
parents aa86c7d2 88c9fafe
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
.pydevproject .pydevproject
*.table *.table
.settings/ .settings/
_db*.py* _*db*.py*
_build/ _build/
cache/ cache/
cron/ cron/
......
...@@ -24,7 +24,5 @@ def index(): ...@@ -24,7 +24,5 @@ def index():
else: else:
session.role = ADMIN session.role = ADMIN
if 'debug' in request.vars: url = URL('plugin_dbui', 'index', args=request.args, vars=request.vars)
return LOAD('plugin_dbui', 'debug', vars=request.vars) return redirect(url)
return LOAD('plugin_dbui', 'index', vars=request.vars)
...@@ -5,10 +5,8 @@ ...@@ -5,10 +5,8 @@
def index(): def index():
session.role = '' session.role = ''
if 'debug' in request.vars: url = URL('plugin_dbui', 'index', args=request.args, vars=request.vars)
return LOAD('plugin_dbui', 'debug', vars=request.vars) return redirect(url)
return LOAD('plugin_dbui', 'index', vars=request.vars)
def guides(): def guides():
......
...@@ -397,6 +397,7 @@ ...@@ -397,6 +397,7 @@
'Niveau 4': 'Niveau 4', 'Niveau 4': 'Niveau 4',
'No harvesters for your selection !!!': 'Pas de moisonneurs pour votre sélection !!!', 'No harvesters for your selection !!!': 'Pas de moisonneurs pour votre sélection !!!',
'Nom': 'Nom', 'Nom': 'Nom',
'not install': 'pas installé',
'Note': 'Note', 'Note': 'Note',
'Notes and reports to committees': 'Notes et Rapports à des Comités', 'Notes and reports to committees': 'Notes et Rapports à des Comités',
'Notes and Reports to Committees': 'Notes et Rapports à des Comités', 'Notes and Reports to Committees': 'Notes et Rapports à des Comités',
......
...@@ -5,6 +5,8 @@ ...@@ -5,6 +5,8 @@
Access to the databases. Access to the databases.
""" """
from _mydb import DBURIS
# Migration flags # Migration flags
MIGRATE = False MIGRATE = False
MIGRATE_USER = False MIGRATE_USER = False
......
...@@ -23,33 +23,31 @@ from regex import (REG_COLLABORATION, ...@@ -23,33 +23,31 @@ from regex import (REG_COLLABORATION,
REG_SUBMITTED, REG_SUBMITTED,
REG_VALID_ORIGIN) REG_VALID_ORIGIN)
#------------------------------------------------------------------------------- # ............................................................................
# #
# PLUGIN DBUI # Language
# #
#-------------------------------------------------------------------------------
plugins = PluginManager() T.set_current_languages('en', 'en-gb', 'en-us') # mother tongue
plugins.dbui.app_css = 'static/my.css' T.force('fr-fr') # user language
plugins.dbui.app_debug = None T.lazy = False # immediate translation
plugins.dbui.app_lg = 'static/limbra/locale/limbra-lang-fr.js'
plugins.dbui.app_libmin = 'static/limbra-min.js' # ............................................................................
plugins.dbui.app_script = 'static/app.js'
# plugins.dbui.app_script_dir = None
#-------------------------------------------------------------------------------
# #
# LANGUAGE # Plugin dbui configuration
# #
#-------------------------------------------------------------------------------
T.set_current_languages('en', 'en-gb', 'en-us') # mother tongue
T.force('fr-fr') # user language
T.lazy = False # immediate translation
#------------------------------------------------------------------------------- dbui.Dbui.define_paths(
app_css = 'static/my.css',
app_lg = 'static/limbra/locale/limbra-lang-fr.js',
app_libmin = 'static/limbra-min.js',
app_script = 'static/app.js')
# ............................................................................
# #
# CONSTANTS # Constants
# #
#-------------------------------------------------------------------------------
undef = T(dbui.UNDEF) undef = T(dbui.UNDEF)
undef_id = dbui.UNDEF_ID undef_id = dbui.UNDEF_ID
year = datetime.datetime.now().year year = datetime.datetime.now().year
...@@ -83,11 +81,15 @@ ONE_HOUR = 3600000 ...@@ -83,11 +81,15 @@ ONE_HOUR = 3600000
STORES = ['cds.cern.ch', 'inspirehep.net'] STORES = ['cds.cern.ch', 'inspirehep.net']
#------------------------------------------------------------------------------- # ............................................................................
# #
# COMMON CONFIGURATION FOR FORMS AND GRIDS # Configure the user interface
# #
#-------------------------------------------------------------------------------
dbui.Dbui.initialise_ui()
directSvc = dbui.Dbui.start_directSvc()
# common configuration for forms and grids
tables = ['application', tables = ['application',
'auth_group', 'auth_group',
'auth_membership', 'auth_membership',
......
...@@ -158,7 +158,7 @@ aboutLeaf = Panel(loader=loader, autoScroll=True) ...@@ -158,7 +158,7 @@ aboutLeaf = Panel(loader=loader, autoScroll=True)
loader = dict(autoLoad=True, loader = dict(autoLoad=True,
renderer='html', renderer='html',
scripts=True, scripts=True,
url=URL('plugin_dbui', 'documentations')) url=URL('plugin_dbui', 'documentations_table'))
docLeaf = Panel(loader=loader, plugins=['pPanelLoaderException'], autoScroll=True) docLeaf = Panel(loader=loader, plugins=['pPanelLoaderException'], autoScroll=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