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

.gitignore

@@ -5,7 +5,7 @@
 .pydevproject
 *.table
 .settings/
-_db*.py*
+_*db*.py*
 _build/
 cache/
 cron/

controllers/admin.py

@@ -24,7 +24,5 @@ def index():
     else:
         session.role = ADMIN
 
-    if 'debug' in request.vars:
-        return LOAD('plugin_dbui', 'debug', vars=request.vars)
-
-    return LOAD('plugin_dbui', 'index', vars=request.vars)
+    url = URL('plugin_dbui', 'index', args=request.args, vars=request.vars)
+    return redirect(url)

controllers/default.py

@@ -5,10 +5,8 @@
 def index():
     session.role = ''
 
-    if 'debug' in request.vars:
-        return LOAD('plugin_dbui', 'debug', vars=request.vars)
-
-    return LOAD('plugin_dbui', 'index', vars=request.vars)
+    url = URL('plugin_dbui', 'index', args=request.args, vars=request.vars)
+    return redirect(url)
 
 
 def guides():

languages/fr-fr.py

@@ -397,6 +397,7 @@
 'Niveau 4': 'Niveau 4',
 'No harvesters for your selection !!!': 'Pas de moisonneurs pour votre sélection !!!',
 'Nom': 'Nom',
+'not install': 'pas installé',
 'Note': 'Note',
 'Notes and reports to committees': 'Notes et Rapports à des Comités',
 'Notes and Reports to Committees': 'Notes et Rapports à des Comités',

models/access.py

@@ -5,6 +5,8 @@
     Access to the databases.
 
 """
+from _mydb import DBURIS
+
 # Migration flags
 MIGRATE = False
 MIGRATE_USER = False

models/common_settings.py

@@ -23,33 +23,31 @@ from regex import (REG_COLLABORATION,
                    REG_SUBMITTED,
                    REG_VALID_ORIGIN)
 
-#-------------------------------------------------------------------------------
+# ............................................................................
 #
-# PLUGIN DBUI
+# Language
 #
-#-------------------------------------------------------------------------------
-plugins = PluginManager()
-plugins.dbui.app_css = 'static/my.css'
-plugins.dbui.app_debug = None
-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
-
-#-------------------------------------------------------------------------------
+
+T.set_current_languages('en', 'en-gb', 'en-us')  # mother tongue
+T.force('fr-fr')                                 # user language
+T.lazy = False                                   # immediate translation
+
+# ............................................................................
 #
-# 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_id = dbui.UNDEF_ID
 year = datetime.datetime.now().year
@@ -83,11 +81,15 @@ ONE_HOUR = 3600000
 
 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',
           'auth_group',
           'auth_membership',

models/widgets_viewport.py

@@ -158,7 +158,7 @@ aboutLeaf = Panel(loader=loader, autoScroll=True)
 loader = dict(autoLoad=True,
               renderer='html',
               scripts=True,
-              url=URL('plugin_dbui', 'documentations'))
+              url=URL('plugin_dbui', 'documentations_table'))
 
 docLeaf = Panel(loader=loader, plugins=['pPanelLoaderException'], autoScroll=True)