← Back to branch summary

~azzar1/unity/add-show-desktop-key

« back to all changes in this revision

Viewing changes to ivle/dispatch/__init__.py

  • Committer: William Grant
  • Date: 2009-06-29 06:43:20 UTC
  • Revision ID: grantw@unimelb.edu.au-20090629064320-vrahlocbh0d5852w
Allow admins to set the admin flag with ivle-adduser (issue #151).

ivle-makeuser was also renamed to ivle-adduser.

Show diffs side-by-side

added added

removed removed

Lines of Context:
ivle/dispatch/__init__.py
37
37
import time
38
38
 
39
39
import mod_python
 
40
import routes
40
41
 
41
42
from ivle import util
42
43
import ivle.config
45
46
from ivle.webapp.base.plugins import ViewPlugin, PublicViewPlugin
46
47
from ivle.webapp.base.xhtml import XHTMLView, XHTMLErrorView
47
48
from ivle.webapp.errors import HTTPError, Unauthorized, NotFound
48
 
from ivle.webapp.routing import Router, RoutingError
49
 
from ivle.webapp import ApplicationRoot
50
49
 
51
50
config = ivle.config.Config()
52
51
 
53
 
def generate_router(view_plugins, root):
 
52
def generate_router(view_plugins, attr):
54
53
    """
55
54
    Build a Mapper object for doing URL matching using 'routes', based on the
56
55
    given plugin registry.
57
56
    """
58
 
    r = Router(root=root)
59
 
 
60
 
    r.add_set_switch('api', 'api')
61
 
 
 
57
    m = routes.Mapper(explicit=True)
62
58
    for plugin in view_plugins:
63
 
        if hasattr(plugin, 'forward_routes'):
64
 
            for fr in plugin.forward_routes:
65
 
                # An annotated function can also be passed in directly.
66
 
                if hasattr(fr, '_forward_route_meta'):
67
 
                    r.add_forward_func(fr)
68
 
                else:
69
 
                    r.add_forward(*fr)
70
 
 
71
 
        if hasattr(plugin, 'reverse_routes'):
72
 
            for rr in plugin.reverse_routes:
73
 
                # An annotated function can also be passed in directly.
74
 
                if hasattr(rr, '_reverse_route_src'):
75
 
                    r.add_reverse_func(rr)
76
 
                else:
77
 
                    r.add_reverse(*rr)
78
 
 
79
 
        if hasattr(plugin, 'views'):
80
 
            for v in plugin.views:
81
 
                r.add_view(*v)
82
 
 
83
 
    return r
 
59
        # Establish a URL pattern for each element of plugin.urls
 
60
        assert hasattr(plugin, 'urls'), "%r does not have any urls" % plugin 
 
61
        for url in getattr(plugin, attr):
 
62
            routex = url[0]
 
63
            view_class = url[1]
 
64
            kwargs_dict = url[2] if len(url) >= 3 else {}
 
65
            m.connect(routex, view=view_class, **kwargs_dict)
 
66
    return m
84
67
 
85
68
def handler(apachereq):
86
69
    """Handles an HTTP request.
102
85
            req.user = user
103
86
 
104
87
    if req.publicmode:
105
 
        raise NotImplementedError("no public mode with obtrav yet!")
106
 
 
107
 
    req.router = generate_router(config.plugin_index[ViewPlugin],
108
 
                                 ApplicationRoot(req.config, req.store))
109
 
 
110
 
    try:
111
 
        obj, viewcls, subpath = req.router.resolve(req.uri.decode('utf-8'))
 
88
        req.mapper = generate_router(config.plugin_index[PublicViewPlugin],
 
89
                                    'public_urls')
 
90
    else:
 
91
        req.mapper = generate_router(config.plugin_index[ViewPlugin], 'urls')
 
92
 
 
93
    matchdict = req.mapper.match(req.uri)
 
94
    if matchdict is not None:
 
95
        viewcls = matchdict['view']
 
96
        # Get the remaining arguments, less 'view', 'action' and 'controller'
 
97
        # (The latter two seem to be built-in, and we don't want them).
 
98
        kwargs = matchdict.copy()
 
99
        del kwargs['view']
112
100
        try:
113
 
            # We 404 if we have a subpath but the view forbids it.
114
 
            if not viewcls.subpath_allowed and subpath:
115
 
                raise NotFound()
116
 
 
117
101
            # Instantiate the view, which should be a BaseView class
118
 
            view = viewcls(req, obj, subpath)
 
102
            view = viewcls(req, **kwargs)
119
103
 
120
104
            # Check that the request (mainly the user) is permitted to access
121
105
            # the view.
154
138
        else:
155
139
            req.store.commit()
156
140
            return req.OK
157
 
    except RoutingError, e:
158
 
        if req.user.admin:
159
 
            XHTMLErrorView(req, NotFound('Not found: ' +
160
 
                                         str(e.args))).render(req)
161
 
        else:
162
 
            XHTMLErrorView(req, NotFound()).render(req)
163
 
 
 
141
    else:
 
142
        XHTMLErrorView(req, NotFound()).render(req)
164
143
        return req.OK
165
144
 
166
145
def handle_unknown_exception(req, exc_type, exc_value, exc_traceback):