fixed a bunch of typos form recent commits, thanks Jonathan
This commit is contained in:
@@ -1 +1 @@
|
|||||||
Version 2.00.0 (2012-08-27 12:15:26) dev
|
Version 2.00.0 (2012-08-27 12:55:36) dev
|
||||||
|
|||||||
+1
-1
@@ -458,7 +458,7 @@ class Session(Storage):
|
|||||||
response.session_cookie_key2 = hashlib.md5(cookie_key).digest()
|
response.session_cookie_key2 = hashlib.md5(cookie_key).digest()
|
||||||
cookie_name = request.application.lower()+'_session_data'
|
cookie_name = request.application.lower()+'_session_data'
|
||||||
response.session_cookie_name = cookie_name
|
response.session_cookie_name = cookie_name
|
||||||
if cookie_data in request.cookies:
|
if cookie_name in request.cookies:
|
||||||
cookie_value = request.cookies[cookie_name].value
|
cookie_value = request.cookies[cookie_name].value
|
||||||
cookie_parts = cookie_value.split(":")
|
cookie_parts = cookie_value.split(":")
|
||||||
enc = cookie_parts[2]
|
enc = cookie_parts[2]
|
||||||
|
|||||||
+2
-1
@@ -814,7 +814,8 @@ class DIV(XmlComponent):
|
|||||||
c.latest = self.latest
|
c.latest = self.latest
|
||||||
c.session = self.session
|
c.session = self.session
|
||||||
c.formname = self.formname
|
c.formname = self.formname
|
||||||
if hideerror and not attributes.get('hideerror',False):
|
if hideerror and not \
|
||||||
|
self.attributes.get('hideerror',False):
|
||||||
c['hideerror'] = hideerror
|
c['hideerror'] = hideerror
|
||||||
newstatus = c._traverse(status,hideerror) and newstatus
|
newstatus = c._traverse(status,hideerror) and newstatus
|
||||||
|
|
||||||
|
|||||||
+3
-1
@@ -36,6 +36,8 @@ import re
|
|||||||
import cStringIO
|
import cStringIO
|
||||||
from gluon import current, redirect, A, URL, DIV, H3, UL, LI, SPAN, INPUT
|
from gluon import current, redirect, A, URL, DIV, H3, UL, LI, SPAN, INPUT
|
||||||
import inspect
|
import inspect
|
||||||
|
import settings
|
||||||
|
is_gae = settings.global_settings.web2py_runtime_gae
|
||||||
|
|
||||||
table_field = re.compile('[\w_]+\.[\w_]+')
|
table_field = re.compile('[\w_]+\.[\w_]+')
|
||||||
widget_class = re.compile('^\w*')
|
widget_class = re.compile('^\w*')
|
||||||
@@ -581,7 +583,7 @@ class AutocompleteWidget(object):
|
|||||||
def callback(self):
|
def callback(self):
|
||||||
if self.keyword in self.request.vars:
|
if self.keyword in self.request.vars:
|
||||||
field = self.fields[0]
|
field = self.fields[0]
|
||||||
if settings.global_settings.web2py_runtime_gae:
|
if is_gae:
|
||||||
rows = self.db(field.__ge__(self.request.vars[self.keyword])&field.__lt__(self.request.vars[self.keyword]+ u'\ufffd')).select(orderby=self.orderby,limitby=self.limitby,*self.fields)
|
rows = self.db(field.__ge__(self.request.vars[self.keyword])&field.__lt__(self.request.vars[self.keyword]+ u'\ufffd')).select(orderby=self.orderby,limitby=self.limitby,*self.fields)
|
||||||
else:
|
else:
|
||||||
rows = self.db(field.like(self.request.vars[self.keyword]+'%')).select(orderby=self.orderby,limitby=self.limitby,distinct=self.distinct,*self.fields)
|
rows = self.db(field.like(self.request.vars[self.keyword]+'%')).select(orderby=self.orderby,limitby=self.limitby,distinct=self.distinct,*self.fields)
|
||||||
|
|||||||
+1
-1
@@ -912,7 +912,7 @@ def render(content = "hello world",
|
|||||||
|
|
||||||
# Add it to the context so we can use it.
|
# Add it to the context so we can use it.
|
||||||
if not 'NOESCAPE' in context:
|
if not 'NOESCAPE' in context:
|
||||||
context['NOESCAPE'] = XML
|
context['NOESCAPE'] = NOESCAPE
|
||||||
|
|
||||||
# save current response class
|
# save current response class
|
||||||
if context and 'response' in context:
|
if context and 'response' in context:
|
||||||
|
|||||||
Reference in New Issue
Block a user