Commit 0fe214bd authored by LE GAC Renaud's avatar LE GAC Renaud
Browse files

Merge branch 'master' into 'production'

Release 0.9.6.4

See merge request !82
parents f936ef30 a4f42353
......@@ -5,7 +5,7 @@
.pydevproject
*.table
.settings/
_db*.py*
_*db*.py*
_build/
cache/
cron/
......
......@@ -2,6 +2,10 @@
HEAD
0.9.6.4 (Apr 2017)
- Migrate to plugin_dbui 0.9.8.1
- This version is not backward compatible due to changes in plugin_dbui.
0.9.6.3 (Nov 2016)
- Add the script cold_start_096x.sql.
- Update plugin_extjs to 6.2.0 and plugin_dbui to 0.9.5.
......@@ -14,20 +18,20 @@ HEAD
- Introduce iterator to scan list of authors and their affiliations.
- Add the script fix_affiliation_keys_0960.py to migrate existing database.
- Update the documentation, add an appendix for HAL Hidden,...
0.9.5.7 (Aug 2016)
- Same as 0.9.5.6 but running with ExtJS 6.0.1
- Require plugin_dbui 0.9.1 and plugin_extjs 6.0.1
- Build via the script build-version6 in w2pext/utilities
0.9.5.6 (Jul 2016)
- Update to harvest true inspirehep collection like HAL Hidden.
0.9.5.5 (Jun 2016)
- Require plugin_dbui 0.9.0 or higher.
- Change the javascript namespaces to Dbui and Limbra.
- Add the author criteria in metrics and graphs selectors.
0.9.5.4 (Jun 2016)
- Move to web2py 2.14.6, matplotlib 1.5.1 and pandas 0.18.1.
The last version of web2py 2.14.6 requires plugin_dbui 0.8.3 or higher.
......
0.9.6.3
\ No newline at end of file
0.9.6.4
\ No newline at end of file
......@@ -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)
......@@ -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():
......
......@@ -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',
......@@ -429,6 +430,7 @@
'organisations': 'organisations',
'organizations': 'organizations',
'Origin': 'Origine',
'Page generated in %s seconds': 'Page générée en %s secondes',
'pages': 'pages',
'Pages': 'Pages',
'Pages range is not defined': 'Les Pages ne sont pas définies',
......
......@@ -5,6 +5,8 @@
Access to the databases.
"""
from _mydb import DBURIS
# Migration flags
MIGRATE = False
MIGRATE_USER = False
......
......@@ -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',
......
......@@ -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)
......
......@@ -14,17 +14,14 @@
<img src="data:image/svg+xml;utf8,{{=data}}" height=400></img>
{{
from datetime import datetime
#
# the footer, processing time of the request
#
delta = (datetime.now()-request.now).total_seconds()
delta = T('Processing time %s seconds') % round(delta, 2)
style = ["font-size: 10px;",
"margin-left: 10px;",
"margin-bottom: 3ex;",
"margin-top: 2ex;"]
response.write(P(delta, _style="".join(style)))
delta = (datetime.now()-request.now).total_seconds()
delta = T('Page generated in %s seconds') % round(delta, 2)
=P(delta, BR(), request.now.strftime("%d %b %Y %H:%M"), _class="dbui-p")
=BR()
}}
\ No newline at end of file
{{
from datetime import datetime
from reporting_tools import format_publication
response.write(BR())
......@@ -50,9 +51,13 @@
#
=BR()
if mylist.footer_flag and request.env.request_method == 'POST':
html_url = A("url", _href=selector.repr_url())
html_url = A("url", _href=selector.repr_url(), _target="_blank")
=P(T("Direct access to the table: "), html_url, _class="my-p")
=P(request.now.strftime("%d %b %Y %H:%M"), _class="my-p")
delta = (datetime.now()-request.now).total_seconds()
delta = T('Page generated in %s seconds') % round(delta, 2)
=P(delta, BR(), request.now.strftime("%d %b %Y %H:%M"), _class="dbui-p")
=BR()
pass
}}
......@@ -11,6 +11,7 @@
# - Title and DIV block
#
#--------------------------------------------------------------------------
from datetime import datetime
#
# unique identifier for the DIV block associated to the grid
......@@ -25,18 +26,13 @@
response.write(DIV(_id=divgrid))
#
# The footer
# The footer, procesing time for the request
#
# Add the URL providing a direct access to this list.
# The application use the POST method will a user will use the GET one.
# Display the URL only in the first case.
#
if request.env.request_method == 'POST':
html_url = A("url", _href=selector.repr_url(), _target='_blank')
=P(T("Direct access to the table: "), html_url, _class="dbui-p")
=P(request.now.strftime("%d %b %Y %H:%M"), _class="dbui-p")
=BR()
pass
delta = (datetime.now()-request.now).total_seconds()
delta = T('Page generated in %s seconds') % round(delta, 2)
=P(delta, BR(), request.now.strftime("%d %b %Y %H:%M"), _class="dbui-p")
=BR()
}}
<script type="text/javascript">
......
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