From ccd7cd0abfda27d0a3ee51ee1749a4d75b0ee127 Mon Sep 17 00:00:00 2001
From: Bo Simonsen <bo@geekworld.dk>
Date: Mon, 10 Dec 2012 15:06:34 +0100
Subject: [PATCH 1/2] Made the widget a bit more resistent to missing entries,
 i.e. vocabularies or in other way indexes. The problem occur if an option is
 deleted from the registry but not deleted from the collections in before
 hand.

---
 plone/formwidget/querystring/input.pt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/plone/formwidget/querystring/input.pt b/plone/formwidget/querystring/input.pt
index 58eeb01..3520b94 100644
--- a/plone/formwidget/querystring/input.pt
+++ b/plone/formwidget/querystring/input.pt
@@ -14,7 +14,8 @@
         <tal:counter tal:define="dummy python:request.set('querystringwidgetcounter', 0)"/>
         <tal:row repeat="row rows">
             <div class="criteria"
-                 tal:condition="python:not request.has_key('removecriteria.%s' % repeat['row'].index)">
+                 tal:condition="python:not request.has_key('removecriteria.%s' % repeat['row'].index) and
+                                       row.i in indexes">
                 <div class="queryindex">
                     <input type="hidden" name="form.widgets.query.i:records"
                            tal:attributes="name python:str(fieldName)+'.i:records'; value row/i" />

From 322132feb3172aebae6d7a35fd3e8e1328bbd433 Mon Sep 17 00:00:00 2001
From: Bo Simonsen <bo@geekworld.dk>
Date: Tue, 15 Jan 2013 11:12:51 +0100
Subject: [PATCH 2/2] Updated change log with recent changes

---
 CHANGES.txt | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index 630b9c7..c7803a4 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -18,6 +18,12 @@ Changelog
 - Translations are now in Plone domain
   [bosim]
 
+- Made the widget a bit more resistent to missing entries, i.e. vocabularies or in 
+  other way indexes. The problem occur if an option is deleted from the registry 
+  but not deleted from the collections in before hand.
+  [bosim]
+
+
 1.0b2 (2012-03-19)
 ------------------