# HG changeset patch
# User Sylvain Thénault <sylvain.thenault@logilab.fr>
# Date 1258631937 -3600
# Node ID 3af225f0faa01d802f6b717032ad34d352be395c
# Parent  7d0d4a6be046453729c481faf306d45d80af8b55# Parent  1169d3154be6f044309d81b94eab4727e0bec0f4
merge

diff -r 7d0d4a6be046 -r 3af225f0faa0 server/schemaserial.py
--- a/server/schemaserial.py	Wed Nov 18 12:50:23 2009 +0100
+++ b/server/schemaserial.py	Thu Nov 19 12:58:57 2009 +0100
@@ -522,8 +522,8 @@
     for action in erschema.ACTIONS:
         for group in sorted(erschema.get_groups(action)):
             try:
-                yield ('SET X %s_permission Y WHERE X is %s, X name "%s", Y eid %s'
-                       % (action, etype, erschema, groupmapping[group]), None)
+                yield ('SET X %s_permission Y WHERE X is %s, X name %%(name)s, Y eid %s'
+                       % (action, etype, groupmapping[group]), {'name': str(erschema)})
             except KeyError:
                 continue
         for rqlexpr in sorted(erschema.get_rqlexprs(action)):
diff -r 7d0d4a6be046 -r 3af225f0faa0 web/views/primary.py
--- a/web/views/primary.py	Wed Nov 18 12:50:23 2009 +0100
+++ b/web/views/primary.py	Thu Nov 19 12:58:57 2009 +0100
@@ -242,18 +242,20 @@
 
 ## default primary ui configuration ###########################################
 
+_pvs = uicfg.primaryview_section
 for rtype in ('eid', 'creation_date', 'modification_date', 'cwuri',
               'is', 'is_instance_of', 'identity',
               'owned_by', 'created_by', 'in_state',
               'wf_info_for', 'by_transition', 'from_state', 'to_state',
               'require_permission', 'from_entity', 'to_entity',
               'see_also'):
-    uicfg.primaryview_section.tag_subject_of(('*', rtype, '*'), 'hidden')
-    uicfg.primaryview_section.tag_object_of(('*', rtype, '*'), 'hidden')
-uicfg.primaryview_section.tag_subject_of(('*', 'use_email', '*'), 'attributes')
-uicfg.primaryview_section.tag_subject_of(('*', 'primary_email', '*'), 'hidden')
+    _pvs.tag_subject_of(('*', rtype, '*'), 'hidden')
+    _pvs.tag_object_of(('*', rtype, '*'), 'hidden')
+
+_pvs.tag_subject_of(('*', 'use_email', '*'), 'attributes')
+_pvs.tag_subject_of(('*', 'primary_email', '*'), 'hidden')
 
 for attr in ('name', 'final'):
-    uicfg.primaryview_section.tag_attribute(('CWEType', attr), 'hidden')
+    _pvs.tag_attribute(('CWEType', attr), 'hidden')
 for attr in ('name', 'final', 'symetric', 'inlined'):
-    uicfg.primaryview_section.tag_attribute(('CWRType', attr), 'hidden')
+    _pvs.tag_attribute(('CWRType', attr), 'hidden')