# HG changeset patch # User Sylvain Thénault # Date 1252947697 -7200 # Node ID 11b6016e397072222fcb7768a4ac129bd4efc179 # Parent be8cfc00ae04954bd53d6f8eb275757a11814b22 cleanup, futur warning fixes :) diff -r be8cfc00ae04 -r 11b6016e3970 web/action.py --- a/web/action.py Mon Sep 14 19:01:24 2009 +0200 +++ b/web/action.py Mon Sep 14 19:01:37 2009 +0200 @@ -32,7 +32,7 @@ 'useractions', 'siteactions', 'hidden'), help=_('context where this component should be displayed')), } - site_wide = True # don't want user to configuration actions eproperties + site_wide = True # don't want user to configurate actions category = 'moreactions' # actions in category 'moreactions' can specify a sub-menu in which they should be filed submenu = None diff -r be8cfc00ae04 -r 11b6016e3970 web/box.py --- a/web/box.py Mon Sep 14 19:01:24 2009 +0200 +++ b/web/box.py Mon Sep 14 19:01:37 2009 +0200 @@ -60,7 +60,8 @@ result = [] actions_by_cat = {} for action in actions: - actions_by_cat.setdefault(action.category, []).append((action.title, action)) + actions_by_cat.setdefault(action.category, []).append( + (action.title, action) ) for key, values in actions_by_cat.items(): actions_by_cat[key] = [act for title, act in sorted(values)] for cat in self.categories_in_order: @@ -150,7 +151,7 @@ __select__ = EntityBoxTemplate.__select__ & partial_has_related_entities() def cell_call(self, row, col, **kwargs): - entity = self.entity(row, col) + entity = self.rset.get_entity(row, col) limit = self.req.property_value('navigation.related-limit') + 1 role = get_role(self) self.w(u'
') @@ -169,7 +170,7 @@ def cell_call(self, row, col, view=None, **kwargs): self.req.add_js('cubicweb.ajax.js') - entity = self.entity(row, col) + entity = self.rset.get_entity(row, col) box = SideBoxWidget(display_name(self.req, self.rtype), self.id) related = self.related_boxitems(entity) unrelated = self.unrelated_boxitems(entity) diff -r be8cfc00ae04 -r 11b6016e3970 web/views/emailaddress.py --- a/web/views/emailaddress.py Mon Sep 14 19:01:24 2009 +0200 +++ b/web/views/emailaddress.py Mon Sep 14 19:01:37 2009 +0200 @@ -68,7 +68,7 @@ __select__ = implements('EmailAddress') def cell_call(self, row, col, **kwargs): - entity = self.entity(row, col) + entity = self.rset.get_entity(row, col) if entity.reverse_primary_email: self.w(u'') if entity.alias: @@ -80,6 +80,7 @@ if entity.reverse_primary_email: self.w(u'') + class EmailAddressMailToView(baseviews.OneLineView): """A one line view that builds a user clickable URL for an email with 'mailto:'""" @@ -88,7 +89,7 @@ __select__ = implements('EmailAddress') def cell_call(self, row, col, **kwargs): - entity = self.entity(row, col) + entity = self.rset.get_entity(row, col) if entity.reverse_primary_email: self.w(u'') if entity.alias: @@ -111,4 +112,4 @@ __select__ = implements('EmailAddress') def cell_call(self, row, col, **kwargs): - self.w(self.entity(row, col).display_address()) + self.w(self.rset.get_entity(row, col).display_address()) diff -r be8cfc00ae04 -r 11b6016e3970 web/views/management.py --- a/web/views/management.py Mon Sep 14 19:01:24 2009 +0200 +++ b/web/views/management.py Mon Sep 14 19:01:37 2009 +0200 @@ -79,7 +79,7 @@ def cell_call(self, row, col): self.req.add_js('cubicweb.edition.js') self.req.add_css('cubicweb.acl.css') - entity = self.entity(row, col) + entity = self.rset.get_entity(row, col) w = self.w _ = self.req._ w(u'

%s %s

' diff -r be8cfc00ae04 -r 11b6016e3970 web/views/schema.py --- a/web/views/schema.py Mon Sep 14 19:01:24 2009 +0200 +++ b/web/views/schema.py Mon Sep 14 19:01:37 2009 +0200 @@ -200,7 +200,7 @@ __select__ = implements('CWEType') def cell_call(self, row, col, **kwargs): - entity = self.entity(row, col) + entity = self.rset.get_entity(row, col) final = entity.final if final: self.w(u'') @@ -228,7 +228,7 @@ __select__ = EntityView.__select__ & implements('CWEType') def cell_call(self, row, col): - entity = self.entity(row, col) + entity = self.rset.get_entity(row, col) self.w(u'

%s

' % _('Attributes')) rset = self.req.execute('Any N,F,D,I,J,DE,A ' 'ORDERBY AA WHERE A is CWAttribute, ' @@ -264,7 +264,7 @@ __select__ = EntityView.__select__ & implements('CWEType') def cell_call(self, row, col): - entity = self.entity(row, col) + entity = self.rset.get_entity(row, col) url = entity.absolute_url(vid='schemagraph') self.w(u'%s' % ( xml_escape(url), @@ -276,7 +276,7 @@ __select__ = EntityView.__select__ & implements('CWEType') def cell_call(self, row, col): - entity = self.entity(row, col) + entity = self.rset.get_entity(row, col) self.w(u'

%s

' % _('Add permissions')) rset = self.req.execute('Any P WHERE X add_permission P, ' 'X eid %(x)s', @@ -305,7 +305,7 @@ has_related_entities('workflow_of', 'object')) def cell_call(self, row, col): - entity = self.entity(row, col) + entity = self.rset.get_entity(row, col) if entity.default_workflow: wf = entity.default_workflow[0] self.w(u'

%s (%s)

' % (wf.name, self.req._('default'))) @@ -389,7 +389,7 @@ def _generate(self, tmpfile): """display schema information for an entity""" - entity = self.entity(self.row, self.col) + entity = self.rset.get_entity(self.row, self.col) eschema = self.vreg.schema.eschema(entity.name) visitor = OneHopESchemaVisitor(self.req, eschema, skiptypes=skip_types(self.req)) @@ -401,7 +401,7 @@ def _generate(self, tmpfile): """display schema information for an entity""" - entity = self.entity(self.row, self.col) + entity = self.rset.get_entity(self.row, self.col) rschema = self.vreg.schema.rschema(entity.name) visitor = OneHopRSchemaVisitor(self.req, rschema) s2d.schema2dot(outputfile=tmpfile, visitor=visitor) diff -r be8cfc00ae04 -r 11b6016e3970 web/views/workflow.py --- a/web/views/workflow.py Mon Sep 14 19:01:24 2009 +0200 +++ b/web/views/workflow.py Mon Sep 14 19:01:37 2009 +0200 @@ -41,7 +41,7 @@ __select__ = implements(IWorkflowable) & match_form_params('treid') def cell_call(self, row, col): - entity = self.entity(row, col) + entity = self.rset.get_entity(row, col) transition = self.req.entity_from_eid(self.req.form['treid']) dest = transition.destination() _ = self.req._ @@ -146,7 +146,7 @@ __select__ = implements('TrInfo') def cell_call(self, row, col, cellvid=None): - self.w(self.entity(row, col).view('reledit', rtype='comment')) + self.w(self.rset.get_entity(row, col).view('reledit', rtype='comment')) class StateInContextView(view.EntityView): @@ -161,9 +161,9 @@ class WorkflowPrimaryView(primary.PrimaryView): __select__ = implements('Workflow') - cache_max_age = 60*60*2 # stay in http cache for 2 hours by default def render_entity_attributes(self, entity): + self.w(entity.view('reledit', rtype='description')) self.w(u'%s' % ( xml_escape(entity.absolute_url(vid='wfgraph')), xml_escape(self.req._('graphical workflow for %s') % entity.name))) @@ -232,7 +232,7 @@ def _generate(self, tmpfile): """display schema information for an entity""" - entity = self.entity(self.row, self.col) + entity = self.rset.get_entity(self.row, self.col) visitor = WorkflowVisitor(entity) prophdlr = WorkflowDotPropsHandler(self.req) generator = GraphGenerator(DotBackend('workflow', 'LR',