Ensure colorbars can't escape their containers. #352

[zzz-spline-users.git] / splinext / users / __init__.py

diff --git a/splinext/users/__init__.py b/splinext/users/__init__.py
index f01995d..8839e9d 100644 (file)
--- a/splinext/users/__init__.py
+++ b/splinext/users/__init__.py
@@ -1,6 +1,6 @@
 from pkg_resources import resource_filename
 
 from pkg_resources import resource_filename
 

-from pylons import c, config, session
+from pylons import config, session, tmpl_context as c

 
 from spline.lib.plugin import PluginBase, PluginLink, Priority
 import spline.model.meta as meta
 
 from spline.lib.plugin import PluginBase, PluginLink, Priority
 import spline.model.meta as meta


@@ -12,12 +12,8 @@ from splinext.users import model as users_model
 
 def add_routes_hook(map, *args, **kwargs):
     """Hook to inject some of our behavior into the routes configuration."""
 
 def add_routes_hook(map, *args, **kwargs):
     """Hook to inject some of our behavior into the routes configuration."""

-    def id_is_numeric(environ, result):
-        try:
-            int(result['id'])
-            return True
-        except (KeyError, ValueError):
-            return False
+    require_GET = dict(conditions=dict(method=['GET']))
+    require_POST = dict(conditions=dict(method=['POST']))

 
     # Login, logout
     map.connect('/accounts/login', controller='accounts', action='login')
 
     # Login, logout
     map.connect('/accounts/login', controller='accounts', action='login')


@@ -26,20 +22,18 @@ def add_routes_hook(map, *args, **kwargs):
     map.connect('/accounts/logout', controller='accounts', action='logout')
 
     # Self-admin
     map.connect('/accounts/logout', controller='accounts', action='logout')
 
     # Self-admin

-    map.connect('/users/{id};{name}/edit', controller='users', action='profile_edit',
-        conditions=dict(function=id_is_numeric))
+    map.connect(r'/users/{id:\d+};{name}/edit', controller='users', action='profile_edit', **require_GET)
+    map.connect(r'/users/{id:\d+};{name}/edit', controller='users', action='profile_edit_commit', **require_POST)

 
     # Public user pages
     map.connect('/users', controller='users', action='list')
 
     # Public user pages
     map.connect('/users', controller='users', action='list')

-    map.connect('/users/{id};{name}', controller='users', action='profile',
-        conditions=dict(function=id_is_numeric))
-    map.connect('/users/{id}', controller='users', action='profile',
-        conditions=dict(function=id_is_numeric))
+    map.connect(r'/users/{id:\d+};{name}', controller='users', action='profile')
+    map.connect(r'/users/{id:\d+}', controller='users', action='profile')

 
     # Big-boy admin
     map.connect('/admin/users/permissions', controller='admin_users', action='permissions')
 
 
     # Big-boy admin
     map.connect('/admin/users/permissions', controller='admin_users', action='permissions')
 

-def monkeypatch_user_hook(*args, **kwargs):
+def monkeypatch_user_hook(config, *args, **kwargs):

     """Hook to tell the `User` model who the root user is."""
     try:
         users_model.User._root_user_id \
     """Hook to tell the `User` model who the root user is."""
     try:
         users_model.User._root_user_id \