{{=T('How did you get here?')}}
diff --git a/applications/welcome3/views/layout.html b/applications/welcome3/views/layout.html index d7e8aa51..2cf9a2a2 100644 --- a/applications/welcome3/views/layout.html +++ b/applications/welcome3/views/layout.html @@ -1,10 +1,4 @@ - - - - - - @@ -26,23 +20,20 @@ http://google.com/webmasters --> - {{ - response.files.insert(0,URL('static','css/web2py.css')) - response.files.insert(1,URL('static','css/bootstrap.min.css')) - response.files.insert(1,URL('static','css/bootstrap-theme.min.css')) - response.files.insert(4,URL('static','css/web2py-bootstrap3.css')) - }} - - - + + + - {{include 'web2py_ajax.html'}} - {{block head}}{{end}} + + diff --git a/gluon/__init__.py b/gluon/__init__.py index a3040351..10441d4b 100644 --- a/gluon/__init__.py +++ b/gluon/__init__.py @@ -20,7 +20,7 @@ try: os.path.dirname(os.path.abspath(__file__)), "packages", "dal")) import pydal sys.modules['pydal'] = pydal -except: +except ImportError: raise RuntimeError( "web2py depends on pydal, which apparently you have not installed.\n" + "Probably you cloned the repository using git without '--recursive'" + diff --git a/gluon/dal.py b/gluon/dal.py index a2eb088b..57a04616 100644 --- a/gluon/dal.py +++ b/gluon/dal.py @@ -134,6 +134,8 @@ class DAL(pyDAL): 'rows_render': sqlhtml.represent, 'rows_xml': sqlhtml.SQLTABLE } + Field = Field + Table = Table #: add web2py contrib drivers to pyDAL from pydal.drivers import DRIVERS diff --git a/gluon/packages/dal b/gluon/packages/dal index ccda4424..9bc00358 160000 --- a/gluon/packages/dal +++ b/gluon/packages/dal @@ -1 +1 @@ -Subproject commit ccda442484e6d952b0e37b6dc6fd8c5e2825db71 +Subproject commit 9bc003583a164c59d77f31c7c31e22ab81c259ee diff --git a/gluon/tools.py b/gluon/tools.py index a6fb3071..ef6ffd89 100644 --- a/gluon/tools.py +++ b/gluon/tools.py @@ -3518,7 +3518,7 @@ class Auth(object): self.db(self.table_group().id == group_id).delete() self.db(self.table_membership().group_id == group_id).delete() self.db(self.table_permission().group_id == group_id).delete() - self.update_groups() + if group_id in self.user_groups: del self.user_groups[group_id] self.log_event(self.messages.del_group_log, dict(group_id=group_id)) def id_group(self, role): @@ -3587,7 +3587,10 @@ class Auth(object): return record.id else: id = membership.insert(group_id=group_id, user_id=user_id) - self.update_groups() + if role: + self.user_groups[group_id] = role + else: + self.update_groups() self.log_event(self.messages['add_membership_log'], dict(user_id=user_id, group_id=group_id)) return id @@ -3607,7 +3610,7 @@ class Auth(object): ret = self.db(membership.user_id == user_id)(membership.group_id == group_id).delete() - self.update_groups() + if group_id in self.user_groups: del self.user_groups[group_id] return ret def has_permission(