dinislage/web2py
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed issue 1152, gae sql varchar limit, and fixed typo in fpdf

Browse Source
This commit is contained in:
mdipierro
2012-11-17 11:46:46 -06:00
parent e3046845bf
commit 019d3e07b5
6 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
VERSION
+1 -1
View File
@@ -1 +1 @@
Version 2.2.1 (2012-11-17 08:59:48) stable Version 2.2.1 (2012-11-17 11:46:41) stable
applications/admin/static/js/web2py.js
+3 -1
View File
@@ -110,7 +110,8 @@ function web2py_ajax_page(method, action, data, target) {
function web2py_component(action, target, timeout, times){ function web2py_component(action, target, timeout, times){
jQuery(function(){ jQuery(function(){
var element = jQuery("#" + target).get(0); var jelement = jQuery("#" + target);
var element = jelement.get(0);
var statement = "jQuery('#" + target + "').get(0).reload();"; var statement = "jQuery('#" + target + "').get(0).reload();";
element.reload = function (){ element.reload = function (){
// Continue if times is Infinity or // Continue if times is Infinity or
@@ -119,6 +120,7 @@ function web2py_component(action, target, timeout, times){
web2py_ajax_page('get', action, null, target);} }; // reload web2py_ajax_page('get', action, null, target);} }; // reload
// Method to check timing limit // Method to check timing limit
element.reload_check = function (){ element.reload_check = function (){
if (jelement.hasClass('w2p_component_stop')) {return false;}
if (this.reload_counter == Infinity){return true;} if (this.reload_counter == Infinity){return true;}
else { else {
if (!isNaN(this.reload_counter)){ if (!isNaN(this.reload_counter)){
applications/examples/static/js/web2py.js
+3 -1
View File
@@ -110,7 +110,8 @@ function web2py_ajax_page(method, action, data, target) {
function web2py_component(action, target, timeout, times){ function web2py_component(action, target, timeout, times){
jQuery(function(){ jQuery(function(){
var element = jQuery("#" + target).get(0); var jelement = jQuery("#" + target);
var element = jelement.get(0);
var statement = "jQuery('#" + target + "').get(0).reload();"; var statement = "jQuery('#" + target + "').get(0).reload();";
element.reload = function (){ element.reload = function (){
// Continue if times is Infinity or // Continue if times is Infinity or
@@ -119,6 +120,7 @@ function web2py_component(action, target, timeout, times){
web2py_ajax_page('get', action, null, target);} }; // reload web2py_ajax_page('get', action, null, target);} }; // reload
// Method to check timing limit // Method to check timing limit
element.reload_check = function (){ element.reload_check = function (){
if (jelement.hasClass('w2p_component_stop')) {return false;}
if (this.reload_counter == Infinity){return true;} if (this.reload_counter == Infinity){return true;}
else { else {
if (!isNaN(this.reload_counter)){ if (!isNaN(this.reload_counter)){
applications/welcome/static/js/web2py.js
+3 -1
View File
@@ -110,7 +110,8 @@ function web2py_ajax_page(method, action, data, target) {
function web2py_component(action, target, timeout, times){ function web2py_component(action, target, timeout, times){
jQuery(function(){ jQuery(function(){
var element = jQuery("#" + target).get(0); var jelement = jQuery("#" + target);
var element = jelement.get(0);
var statement = "jQuery('#" + target + "').get(0).reload();"; var statement = "jQuery('#" + target + "').get(0).reload();";
element.reload = function (){ element.reload = function (){
// Continue if times is Infinity or // Continue if times is Infinity or
@@ -119,6 +120,7 @@ function web2py_component(action, target, timeout, times){
web2py_ajax_page('get', action, null, target);} }; // reload web2py_ajax_page('get', action, null, target);} }; // reload
// Method to check timing limit // Method to check timing limit
element.reload_check = function (){ element.reload_check = function (){
if (jelement.hasClass('w2p_component_stop')) {return false;}
if (this.reload_counter == Infinity){return true;} if (this.reload_counter == Infinity){return true;}
else { else {
if (!isNaN(this.reload_counter)){ if (!isNaN(this.reload_counter)){
gluon/contrib/fpdf/html.py
+1 -1
View File
@@ -28,7 +28,7 @@ class HTML2FPDF(HTMLParser):
def __init__(self, pdf, image_map = None): def __init__(self, pdf, image_map = None):
HTMLParser.__init__(self) HTMLParser.__init__(self)
self.image_map = self.image_map or lambda src: src self.image_map = image_map or (lambda src: src)
self.style = {} self.style = {}
self.pre = False self.pre = False
self.href = '' self.href = ''
gluon/dal.py
+1 -1
View File
@@ -3970,7 +3970,7 @@ class DatabaseStoredFile:
self.filename = filename self.filename = filename
self.mode = mode self.mode = mode
if not self.web2py_filesystem: if not self.web2py_filesystem:
self.db.executesql("CREATE TABLE IF NOT EXISTS web2py_filesystem (path VARCHAR(512), content LONGTEXT, PRIMARY KEY(path) ) ENGINE=InnoDB;") self.db.executesql("CREATE TABLE IF NOT EXISTS web2py_filesystem (path VARCHAR(255), content LONGTEXT, PRIMARY KEY(path) ) ENGINE=InnoDB;")
DatabaseStoredFile.web2py_filesystem = True DatabaseStoredFile.web2py_filesystem = True
self.p=0 self.p=0
self.data = '' self.data = ''