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

Added modular DAL, updated gluon imports to new structure

Browse Source
This commit is contained in:
gi0baro
2014-09-03 12:48:03 +02:00
parent d73c668f2d
commit 5e5e649c28
43 changed files with 11577 additions and 11686 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gluon/tools.py
+12 -12
View File
@@ -40,7 +40,7 @@ from gluon import *
from gluon.contrib.autolinks import expand_one
from gluon.contrib.markmin.markmin2html import \
replace_at_urls, replace_autolinks, replace_components
from gluon.dal import Row, Set, Query
from gluon.dal.objects import Table, Row, Set, Query
import gluon.serializers as serializers
@@ -1727,7 +1727,7 @@ class Auth(object):
except:
return id
ondelete = self.settings.ondelete
self.signature = db.Table(
self.signature = Table(
self.db, 'auth_signature',
Field('is_active', 'boolean',
default=True,
@@ -1783,7 +1783,7 @@ class Auth(object):
signature_list = [self.signature]
elif not signature:
signature_list = []
elif isinstance(signature, self.db.Table):
elif isinstance(signature, Table):
signature_list = [signature]
else:
signature_list = signature
@@ -3998,10 +3998,10 @@ class Crud(object):
formname=DEFAULT,
**attributes
):
if not (isinstance(table, self.db.Table) or table in self.db.tables) \
if not (isinstance(table, Table) or table in self.db.tables) \
or (isinstance(record, str) and not str(record).isdigit()):
raise HTTP(404)
if not isinstance(table, self.db.Table):
if not isinstance(table, Table):
table = self.db[table]
try:
record_id = record.id
@@ -4132,10 +4132,10 @@ class Crud(object):
)
def read(self, table, record):
if not (isinstance(table, self.db.Table) or table in self.db.tables) \
if not (isinstance(table, Table) or table in self.db.tables) \
or (isinstance(record, str) and not str(record).isdigit()):
raise HTTP(404)
if not isinstance(table, self.db.Table):
if not isinstance(table, Table):
table = self.db[table]
if not self.has_permission('read', table, record):
redirect(self.settings.auth.settings.on_failed_authorization)
@@ -4160,9 +4160,9 @@ class Crud(object):
next=DEFAULT,
message=DEFAULT,
):
if not (isinstance(table, self.db.Table) or table in self.db.tables):
if not (isinstance(table, Table) or table in self.db.tables):
raise HTTP(404)
if not isinstance(table, self.db.Table):
if not isinstance(table, Table):
table = self.db[table]
if not self.has_permission('delete', table, record_id):
redirect(self.settings.auth.settings.on_failed_authorization)
@@ -4190,13 +4190,13 @@ class Crud(object):
orderby=None,
limitby=None,
):
if not (isinstance(table, self.db.Table) or table in self.db.tables):
if not (isinstance(table, Table) or table in self.db.tables):
raise HTTP(404)
if not self.has_permission('select', table):
redirect(self.settings.auth.settings.on_failed_authorization)
#if record_id and not self.has_permission('select', table):
# redirect(self.settings.auth.settings.on_failed_authorization)
if not isinstance(table, self.db.Table):
if not isinstance(table, Table):
table = self.db[table]
if not query:
query = table.id > 0
@@ -4303,7 +4303,7 @@ class Crud(object):
validate = args.get('validate',True)
request = current.request
db = self.db
if not (isinstance(table, db.Table) or table in db.tables):
if not (isinstance(table, Table) or table in db.tables):
raise HTTP(404)
attributes = {}
for key in ('orderby', 'groupby', 'left', 'distinct', 'limitby', 'cache'):