--- a/web/views/primary.py	Tue Feb 14 15:14:22 2012 +0100
+++ b/web/views/primary.py	Tue Jul 10 15:07:23 2012 +0200
@@ -82,9 +82,6 @@
         Renders the relation label next to the relation value if set to `True`.
         Otherwise, does only display the relation value.
 
-    :attr:`skip_none`
-        Does not render an attribute value that is None if set to `True`.
-
     :attr:`main_related_section`
         Renders the relations of the entity if set to `True`.
 
@@ -99,7 +96,6 @@
     title = _('primary')
     show_attr_label = True
     show_rel_label = True
-    skip_none = True
     rsection = uicfg.primaryview_section
     display_ctrl = uicfg.primaryview_display_ctrl
     main_related_section = True
@@ -148,9 +144,6 @@
         if boxes or hasattr(self, 'render_side_related'):
             self.w(u'</td><td>')
             self.w(u'<div class="primaryRight">')
-            if hasattr(self, 'render_side_related'):
-                warn('[3.2] render_side_related is deprecated')
-                self.render_side_related(entity, []) # pylint: disable=E1101
             self.render_side_boxes(boxes)
             self.w(u'</div>')
             self.w(u'</td></tr></table>')
@@ -197,9 +190,7 @@
         return u''
 
     def render_entity_attributes(self, entity):
-        """Renders all attributes and relations in the 'attributes' section. The
-        :attr:`skip_none` attribute controls the display of `None` valued
-        attributes.
+        """Renders all attributes and relations in the 'attributes' section. 
         """
         display_attributes = []
         for rschema, _, role, dispctrl in self._section_def(entity, 'attributes'):
@@ -213,7 +204,7 @@
                     value = self._cw.view(vid, rset)
                 else:
                     value = None
-            if not self.skip_none or (value is not None and value != ''):
+            if value is not None and value != '':
                 display_attributes.append( (rschema, role, dispctrl, value) )
         if display_attributes:
             self.w(u'<table>')
@@ -222,17 +213,12 @@
                 if not hasattr(self, '_render_attribute'):
                     label = self._rel_label(entity, rschema, role, dispctrl)
                     self.render_attribute(label, value, table=True)
-                elif support_args(self._render_attribute, 'dispctrl'):
+                else:
                     warn('[3.9] _render_attribute prototype has changed and '
                          'renamed to render_attribute, please update %s'
                          % self.__class__, DeprecationWarning)
                     self._render_attribute(dispctrl, rschema, value, role=role,
                                            table=True)
-                else:
-                    self._render_attribute(rschema, value, role=role, table=True)
-                    warn('[3.6] _render_attribute prototype has changed and '
-                         'renamed to render_attribute, please update %s'
-                         % self.__class__, DeprecationWarning)
             self.w(u'</table>')
 
     def render_attribute(self, label, value, table=False):
@@ -258,17 +244,10 @@
                     continue
                 if hasattr(self, '_render_relation'):
                     # pylint: disable=E1101
-                    if not support_args(self._render_relation, 'showlabel'):
-                        self._render_relation(dispctrl, rset, 'autolimited')
-                        warn('[3.9] _render_relation prototype has changed and has '
-                             'been renamed to render_relation, please update %s'
-                             % self.__class__, DeprecationWarning)
-                    else:
-                        self._render_relation(rset, dispctrl, 'autolimited',
-                                              self.show_rel_label)
-                        warn('[3.6] _render_relation prototype has changed and has '
-                             'been renamed to render_relation, please update %s'
-                             % self.__class__, DeprecationWarning)
+                    self._render_relation(dispctrl, rset, 'autolimited')
+                    warn('[3.9] _render_relation prototype has changed and has '
+                         'been renamed to render_relation, please update %s'
+                         % self.__class__, DeprecationWarning)
                     continue
                 vid = dispctrl.get('vid', 'autolimited')
                 try:
@@ -434,7 +413,7 @@
     __regid__ = 'attribute'
     __select__ = EntityView.__select__ & match_kwargs('rtype')
 
-    def entity_call(self, entity, rtype, role, **kwargs):
+    def entity_call(self, entity, rtype, role='subject', **kwargs):
         if self._cw.vreg.schema.rschema(rtype).final:
             self.w(entity.printable_value(rtype))
         else:
@@ -494,5 +473,3 @@
 for rtype in META_RTYPES:
     _pvs.tag_subject_of(('*', rtype, '*'), 'hidden')
     _pvs.tag_object_of(('*', rtype, '*'), 'hidden')
-_pvs.tag_subject_of(('*', 'require_permission', '*'), 'hidden')
-_pvs.tag_object_of(('*', 'require_permission', '*'), 'hidden')