# HG changeset patch
# User Nicolas Chauvat <nicolas.chauvat@logilab.fr>
# Date 1274344855 -7200
# Node ID d29d1a1ce15d27ee68949cda4444ef96d8b0da62
# Parent  26be1e50e2cf91ad380430c33937d190ee8c6c06# Parent  1bdaa9e1cd57d786c95ff3e9af6d84659b6b1332
merge

diff -r 1bdaa9e1cd57 -r d29d1a1ce15d .hgtags
--- a/.hgtags	Thu May 20 10:04:45 2010 +0200
+++ b/.hgtags	Thu May 20 10:40:55 2010 +0200
@@ -125,3 +125,5 @@
 24cc65ab2eca05729d66cef3de6f69bb7f9dfa35 cubicweb-debian-version-3.8.0-1
 1e074c6150fe00844160986852db364cc5992848 cubicweb-version-3.8.1
 eb972d125eefd0de2d0743e95c6e1f4e3e93e4c1 cubicweb-debian-version-3.8.1-1
+ef2e37d34013488a2018e73338fbbfbde5901c5c cubicweb-version-3.8.2
+2b962bb9eee8ee7156a12cf137428c292f8e3b35 cubicweb-debian-version-3.8.2-1
diff -r 1bdaa9e1cd57 -r d29d1a1ce15d web/form.py
--- a/web/form.py	Thu May 20 10:04:45 2010 +0200
+++ b/web/form.py	Thu May 20 10:40:55 2010 +0200
@@ -80,8 +80,6 @@
     __metaclass__ = metafieldsform
     __registry__ = 'forms'
 
-    internal_fields = ('__errorurl',) + controller.NAV_FORM_PARAMETERS
-
     parent_form = None
     force_session_key = None
     domid = 'form'
diff -r 1bdaa9e1cd57 -r d29d1a1ce15d web/views/forms.py
--- a/web/views/forms.py	Thu May 20 10:04:45 2010 +0200
+++ b/web/views/forms.py	Thu May 20 10:40:55 2010 +0200
@@ -222,8 +222,6 @@
     __regid__ = 'base'
     __select__ = (match_kwargs('entity')
                   | (one_line_rset() & non_final_entity()))
-
-    internal_fields = FieldsForm.internal_fields + ('__type', 'eid', '__maineid')
     domid = 'entityForm'
 
     @iclassmethod