← Back to branch summary

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

« back to all changes in this revision

Viewing changes to ivle/webapp/base/views.py

ivle.webapp.base.views#JSONRESTView: Named operations now take the request.

Show diffs side-by-side

added added

removed removed

Lines of Context:
ivle/webapp/base/views.py
99
99
               not op._rest_api_callable:
100
100
                raise BadRequest('Invalid named operation.')
101
101
 
102
 
            # Find any missing arguments, except for the first one (self).
 
102
            # Find any missing arguments, except for the first two (self, req)
103
103
            (args, vaargs, varkw, defaults) = inspect.getargspec(op)
104
 
            args = args[1:]
 
104
            args = args[2:]
105
105
 
106
106
            # To find missing arguments, we eliminate the provided arguments
107
107
            # from the set of remaining function signature arguments. If the
122
122
            if extra and not varkw:
123
123
                raise BadRequest('Extra arguments: ' + ', '.join(extra))
124
124
 
125
 
            outjson = op(**opargs)
 
125
            outjson = op(req, **opargs)
126
126
        else:
127
127
            raise AssertionError('Unknown method somehow got through.')
128
128