diff -r 3864c7dfddf0 -r 20f429eb5f46 web/views/basecontrollers.py --- a/web/views/basecontrollers.py Mon Oct 19 20:26:22 2009 +0200 +++ b/web/views/basecontrollers.py Mon Oct 19 20:33:30 2009 +0200 @@ -397,26 +397,15 @@ self.req.form = self._rebuild_posted_form(names, values, action) return _validate_form(self.req, self.vreg) - @jsonize - def js_edit_field(self, action, names, values, rtype, eid, default): - success, args, _ = self.validate_form(action, names, values) - if success: - # Any X,N where we don't seem to use N is an optimisation - # printable_value won't need to query N again - rset = self.req.execute('Any X,N WHERE X eid %%(x)s, X %s N' % rtype, - {'x': eid}, 'x') - entity = rset.get_entity(0, 0) - value = entity.printable_value(rtype) or default - return (success, args, value) - else: - return (success, args, None) - - @jsonize - def js_reledit_form(self, eid, rtype, role, default, lzone): - """XXX we should get rid of this and use loadxhtml""" - entity = self.req.entity_from_eid(eid) - return entity.view('reledit', rtype=rtype, role=role, - default=default, landing_zone=lzone) + @xhtmlize + def js_reledit_form(self): + args = dict((x,self.req.form[x]) + for x in frozenset(('rtype', 'role', 'reload', 'landing_zone'))) + entity = self.req.entity_from_eid(int(self.req.form['eid'])) + # note: default is reserved in js land + args['default'] = self.req.form['default_value'] + args['reload'] = simplejson.loads(args['reload']) + return entity.view('reledit', **args) @jsonize def js_i18n(self, msgids):