diff --git a/VERSION b/VERSION index d1fbe6cb..de106cbb 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.6.0-development+timestamp.2013.07.19.04.38.04 +Version 2.6.0-development+timestamp.2013.07.19.11.30.43 diff --git a/applications/admin/static/js/web2py.js b/applications/admin/static/js/web2py.js index 57ff9295..507be9f5 100644 --- a/applications/admin/static/js/web2py.js +++ b/applications/admin/static/js/web2py.js @@ -72,6 +72,7 @@ var date_format = (typeof w2p_ajax_date_format != 'undefined') ? w2p_ajax_date_format : "%Y-%m-%d"; var datetime_format = (typeof w2p_ajax_datetime_format != 'undefined') ? w2p_ajax_datetime_format : "%Y-%m-%d %H:%M:%S"; $("input.date", target).each(function () { + $(this).attr('autocomplete','off'); Calendar.setup({ inputField: this, ifFormat: date_format, @@ -79,6 +80,7 @@ }); }); $("input.datetime", target).each(function () { + $(this).attr('autocomplete','off'); Calendar.setup({ inputField: this, ifFormat: datetime_format, @@ -87,7 +89,7 @@ }); }); $("input.time", target).each(function () { - $(this).timeEntry(); + $(this).timeEntry().attr('autocomplete','off'); }); /*adds btn class to buttons*/ $('button', target).addClass('btn'); diff --git a/applications/examples/static/js/web2py.js b/applications/examples/static/js/web2py.js index 57ff9295..507be9f5 100644 --- a/applications/examples/static/js/web2py.js +++ b/applications/examples/static/js/web2py.js @@ -72,6 +72,7 @@ var date_format = (typeof w2p_ajax_date_format != 'undefined') ? w2p_ajax_date_format : "%Y-%m-%d"; var datetime_format = (typeof w2p_ajax_datetime_format != 'undefined') ? w2p_ajax_datetime_format : "%Y-%m-%d %H:%M:%S"; $("input.date", target).each(function () { + $(this).attr('autocomplete','off'); Calendar.setup({ inputField: this, ifFormat: date_format, @@ -79,6 +80,7 @@ }); }); $("input.datetime", target).each(function () { + $(this).attr('autocomplete','off'); Calendar.setup({ inputField: this, ifFormat: datetime_format, @@ -87,7 +89,7 @@ }); }); $("input.time", target).each(function () { - $(this).timeEntry(); + $(this).timeEntry().attr('autocomplete','off'); }); /*adds btn class to buttons*/ $('button', target).addClass('btn'); diff --git a/applications/welcome/static/js/web2py.js b/applications/welcome/static/js/web2py.js index 57ff9295..507be9f5 100644 --- a/applications/welcome/static/js/web2py.js +++ b/applications/welcome/static/js/web2py.js @@ -72,6 +72,7 @@ var date_format = (typeof w2p_ajax_date_format != 'undefined') ? w2p_ajax_date_format : "%Y-%m-%d"; var datetime_format = (typeof w2p_ajax_datetime_format != 'undefined') ? w2p_ajax_datetime_format : "%Y-%m-%d %H:%M:%S"; $("input.date", target).each(function () { + $(this).attr('autocomplete','off'); Calendar.setup({ inputField: this, ifFormat: date_format, @@ -79,6 +80,7 @@ }); }); $("input.datetime", target).each(function () { + $(this).attr('autocomplete','off'); Calendar.setup({ inputField: this, ifFormat: datetime_format, @@ -87,7 +89,7 @@ }); }); $("input.time", target).each(function () { - $(this).timeEntry(); + $(this).timeEntry().attr('autocomplete','off'); }); /*adds btn class to buttons*/ $('button', target).addClass('btn'); diff --git a/gluon/dal.py b/gluon/dal.py index c164798c..4360dea2 100644 --- a/gluon/dal.py +++ b/gluon/dal.py @@ -951,7 +951,7 @@ class BaseAdapter(ConnectionPool): dbpath, '%s_%s.table' % (table._db._uri_hash, tablename)) if table._dbt: - logfilename = self._adepter.adapter_args.get('logfile','sql.log') + logfilename = self.adapter_args.get('logfile','sql.log') table._loggername = pjoin(dbpath, logfilename) logfile = self.file_open(table._loggername, 'a') else: