# HG changeset patch # User Adrien Di Mascio # Date 1252347820 -7200 # Node ID aa43c0c22b9891ebfe142bd62cf1a34061be4d07 # Parent b788903e77d548f7fb6f4849bc45e9962e7e2984# Parent 0829808e93c15f85f94fc2fb5a953bcf2063c48a merge diff -r b788903e77d5 -r aa43c0c22b98 web/data/cubicweb.facets.js --- a/web/data/cubicweb.facets.js Fri Sep 04 16:13:04 2009 +0200 +++ b/web/data/cubicweb.facets.js Mon Sep 07 20:23:40 2009 +0200 @@ -130,9 +130,10 @@ }); facet.find('div.facetCheckBox').click(function () { var $this = jQuery(this); - if ($this.hasClass('facetValueDisabled')){ - return - } + // NOTE : add test on the facet operator (i.e. OR, AND) + // if ($this.hasClass('facetValueDisabled')){ + // return + // } if ($this.hasClass('facetValueSelected')) { $this.removeClass('facetValueSelected'); $this.find('img').each(function (i){ diff -r b788903e77d5 -r aa43c0c22b98 web/formwidgets.py --- a/web/formwidgets.py Fri Sep 04 16:13:04 2009 +0200 +++ b/web/formwidgets.py Mon Sep 07 20:23:40 2009 +0200 @@ -430,8 +430,9 @@ # XXX entity form specific entity = form.edited_entity attrs['cubicweb:etype_to'] = entity.e_schema - etype_from = entity.e_schema.subject_relation(self.name).objects(entity.e_schema)[0] + etype_from = entity.e_schema.subject_relation(field.name).objects(entity.e_schema)[0] attrs['cubicweb:etype_from'] = etype_from + return name, values, attrs def render(self, form, field, renderer): return super(AddComboBoxWidget, self).render(form, field, renderer) + u'''