diff -r 4ceaf8f2709b -r 62d3726ad8cb web/views/cwproperties.py --- a/web/views/cwproperties.py Tue May 19 11:48:55 2009 +0200 +++ b/web/views/cwproperties.py Tue May 19 11:50:15 2009 +0200 @@ -17,6 +17,7 @@ from cubicweb.view import StartupView from cubicweb.web import uicfg, stdmsgs from cubicweb.web.form import CompositeForm, EntityFieldsForm, FormViewMixIn +from cubicweb.web.formrenderers import FormRenderer from cubicweb.web.formfields import FIELDS, StringField from cubicweb.web.formwidgets import Select, Button, SubmitButton from cubicweb.web.views import primary @@ -48,10 +49,9 @@ _('category') -def make_togglable_link(nodeid, label, cookiename): +def make_togglable_link(nodeid, label): """builds a HTML link that switches the visibility & remembers it""" - action = u"javascript: toggleVisibility('%s', '%s')" % \ - (nodeid, cookiename) + action = u"javascript: togglePrefVisibility('%s')" % nodeid return u'%s' % (action, label) def css_class(someclass): @@ -95,7 +95,7 @@ def call(self, **kwargs): """The default view representing the application's index""" - self.req.add_js('cubicweb.preferences.js') + self.req.add_js(('cubicweb.edition.js', 'cubicweb.preferences.js', 'cubicweb.ajax.js')) self.req.add_css('cubicweb.preferences.css') vreg = self.vreg values = self.defined_keys @@ -113,41 +113,51 @@ mainopts.setdefault(parts[0], []).append(key) # precompute form to consume error message for group, keys in mainopts.items(): - mainopts[group] = self.form(keys, True) + mainopts[group] = self.form(group, keys, False) + for group, objects in groupedopts.items(): for oid, keys in objects.items(): - groupedopts[group][oid] = self.form(keys, True) + groupedopts[group][oid] = self.form(group + '-' + oid, keys, True) + w = self.w req = self.req _ = req._ w(u'

%s

\n' % _(self.title)) - # we don't want this in each sub-forms + # we don't want this in each sub-forms XXX w(u'
%s
' % self.req._('validating...')) for label, group, form in sorted((_(g), g, f) for g, f in mainopts.iteritems()): status = css_class(self._group_status(group)) w(u'

%s

\n' % - (make_togglable_link('fieldset_' + group, label, - self._cookie_name(group)))) + (make_togglable_link('fieldset_' + group, label.capitalize()))) w(u'
' % (group, status)) + w(u'
') w(form) - w(u'
') + w(u'') + for label, group, objects in sorted((_(g), g, o) for g, o in groupedopts.iteritems()): status = css_class(self._group_status(group)) w(u'

%s

\n' % - (make_togglable_link('fieldset_' + group, label, - self._cookie_name(group)))) + (make_togglable_link('fieldset_' + group, label.capitalize()))) w(u'
' % (group, status)) - for label, oid, form in sorted((self.req.__('%s_%s' % (group, o)), o, f) - for o, f in objects.iteritems()): - w(u'
') - w(u'%s\n' % label) + + # create selection + sorted_objects = sorted((self.req.__('%s_%s' % (group, o)), o, f) + for o, f in objects.iteritems()) + for label, oid, form in sorted_objects: + w(u'''
%(label)s''' % {'label':label, 'oid':oid, 'group':group}) + w(u''' (
%(label)s
)''' + % {'label':_('close all'), 'group':group}) + w(u'
') docmsgid = '%s_%s_description' % (group, oid) doc = _(docmsgid) if doc != docmsgid: - w(u'

%s

' % html_escape(doc)) - w(form) + w(u'
%s
' % html_escape(doc).capitalize()) + + w(u'
' + % {'oid':oid, 'group':group}) + w(form) w(u'
') w(u'
') @@ -175,20 +185,22 @@ entity['value'] = self.vreg.property_value(key) return entity - def form(self, keys, splitlabel=False): - buttons = [SubmitButton(), - Button(stdmsgs.BUTTON_CANCEL, cwaction='cancel')] - form = CompositeForm(self.req, domid=None, action=self.build_url(), - form_buttons=buttons, + def form(self, formid, keys, splitlabel=False): + buttons = [SubmitButton()] + form = CompositeForm(self.req, domid=formid, action=self.build_url(), + form_buttons=buttons, + onsubmit="return validatePrefsForm('%s')" % formid, submitmsg=self.req._('changes applied')) - path = self.req.relative_path() + path = self.req.relative_path() if '?' in path: path, params = path.split('?', 1) form.form_add_hidden('__redirectparams', params) form.form_add_hidden('__redirectpath', path) for key in keys: self.form_row(form, key, splitlabel) - return form.form_render(display_progress_div=False) + renderer = EPropertiesFormRenderer() + return form.form_render(display_progress_div=False, + renderer=renderer) def form_row(self, form, key, splitlabel): entity = self.entity_for_key(key) @@ -196,15 +208,16 @@ label = key.split('.')[-1] else: label = key - subform = EntityFieldsForm(self.req, entity=entity, set_error_url=False) + subform = EntityFieldsForm(self.req, entity=entity, set_error_url=False) + subform.append_field(PropertyValueField(name='value', label=label, eidparam=True)) subform.vreg = self.vreg subform.form_add_hidden('pkey', key, eidparam=True) + subform.form_add_hidden("current-value:%s" % entity.eid,) form.form_add_subform(subform) return subform - - + def is_user_prefs(cls, req, rset, row=None, col=0, **kwargs): return req.user.eid == rset[row or 0][col] @@ -326,7 +339,7 @@ if vocab is not None: if callable(vocab): # list() just in case its a generator function - self.choices = list(vocab(form.req)) + self.choices = list(vocab(form.req)) else: self.choices = vocab wdg = Select() @@ -338,6 +351,30 @@ wdg.attrs.setdefault('size', 3) self.widget = wdg +class EPropertiesFormRenderer(FormRenderer): + """specific renderer for cwproperties""" + + def open_form(self, form, values): + err = '
' + return super(EPropertiesFormRenderer, self).open_form(form, values) + err + + def _render_fields(self, fields, w, form): + for field in fields: + w(u'
\n') + if self.display_label: + w(u'%s' % self.render_label(form, field)) + error = form.form_field_error(field) + w(u'%s' % self.render_help(form, field)) + w(u'
') + w(field.render(form, self)) + w(u'
') + w(u'
') + + def render_buttons(self, w, form): + w(u'
\n') + for button in form.form_buttons: + w(u'%s\n' % button.render(form)) + w(u'
') uicfg.autoform_field.tag_attribute(('CWProperty', 'pkey'), PropertyKeyField) uicfg.autoform_field.tag_attribute(('CWProperty', 'value'), PropertyValueField)