diff -r a4acf959d07e -r a2f2430dcd50 web/views/startup.py --- a/web/views/startup.py Wed Jun 24 16:58:28 2009 +0200 +++ b/web/views/startup.py Wed Jun 24 16:58:56 2009 +0200 @@ -177,6 +177,7 @@ self.w(u'

%s

' % _('Schema of the data model')) self.render_tabs(self.tabs, self.default_tab) + class SchemaTabImageView(StartupView): id = 'schema-image' @@ -189,6 +190,7 @@ html_escape(self.req.build_url('view', vid='schemagraph', withmeta=0)), self.req._("graphical representation of the application'schema"))) + class SchemaTabTextView(StartupView): id = 'schema-text' @@ -205,11 +207,12 @@ class ManagerSchemaPermissionsView(StartupView, SecurityViewMixIn): - id = 'schema_security' + id = 'schema-security' __select__ = StartupView.__select__ & match_user_groups('managers') def call(self, display_relations=True, skiprels=('is', 'is_instance_of', 'identity', 'owned_by', 'created_by')): + self.req.add_css('cubicweb.acl.css') _ = self.req._ formparams = {} formparams['sec'] = self.id @@ -222,28 +225,31 @@ entities = [eschema for eschema in entities if not eschema.meta] # compute relations - relations = [] if display_relations: relations = [rschema for rschema in schema.relations() if not (rschema.is_final() or rschema.type in skiprels)] if not formparams['withmeta']: relations = [rschema for rschema in relations if not rschema.meta] + else: + relations = [] # index self.w(u'
') self.w(u'

%s

' % _('index').capitalize()) self.w(u'

%s

' % _('Entities').capitalize()) ents = [] for eschema in sorted(entities): - url = html_escape(self.build_url('schema', **formparams) + '#' + eschema.type) - ents.append(u'
%s (%s)' % (url, eschema.type, _(eschema.type))) - self.w('%s' % ', '.join(ents)) + url = html_escape(self.build_url('schema', **formparams)) + ents.append(u'%s (%s)' % ( + url, eschema.type, eschema.type, _(eschema.type))) + self.w(u', '.join(ents)) self.w(u'

%s

' % (_('relations').capitalize())) rels = [] - for eschema in sorted(relations): - url = html_escape(self.build_url('schema', **formparams) + '#' + eschema.type) - rels.append(u'%s (%s), ' % (url , eschema.type, _(eschema.type))) - self.w('%s' % ', '.join(ents)) + for rschema in sorted(relations): + url = html_escape(self.build_url('schema', **formparams)) + rels.append(u'%s (%s), ' % ( + url , rschema.type, rschema.type, _(rschema.type))) + self.w(u', '.join(ents)) # entities self.display_entities(entities, formparams) # relations