Mercurial Mercurial > pub > hg > cubicweb / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
3.6 api update
authorSylvain Thénault <sylvain.thenault@logilab.fr>
Wed, 13 Jan 2010 16:01:34 +0100
changeset 4230 6514a76eaa5c
parent 4229 1c8e92afb94b
child 4231 d55cac808b08
3.6 api update
sobjects/notification.py file | annotate | diff | comparison | revisions
web/views/basecomponents.py file | annotate | diff | comparison | revisions 
--- a/sobjects/notification.py	Wed Jan 13 16:00:42 2010 +0100
+++ b/sobjects/notification.py	Wed Jan 13 16:01:34 2010 +0100
@@ -146,19 +146,19 @@
 
     def context(self, **kwargs):
         context = super(EntityUpdatedNotificationView, self).context(**kwargs)
-        changes = self.req.transaction_data['changes'][self.rset[0][0]]
-        _ = self.req._
+        changes = self._cw.transaction_data['changes'][self.cw_rset[0][0]]
+        _ = self._cw._
         formatted_changes = []
-        entity = self.entity(self.row or 0, self.col or 0)
+        entity = self.cw_rset.get_entity(self.cw_row or 0, self.cw_col or 0)
         for attr, oldvalue, newvalue in sorted(changes):
             # check current user has permission to see the attribute
-            rschema = self.vreg.schema[attr]
+            rschema = self._cw.vreg.schema[attr]
             if rschema.final:
                 rdef = entity.e_schema.rdef(rschema)
-                if not rdef.has_perm(self.req, 'read', eid=self.rset[0][0]):
+                if not rdef.has_perm(self._cw, 'read', eid=self.cw_rset[0][0]):
                     continue
             # XXX suppose it's a subject relation...
-            elif not rschema.has_perm(self.req, 'read', fromeid=self.rset[0][0]): # XXX toeid
+            elif not rschema.has_perm(self._cw, 'read', fromeid=self.cw_rset[0][0]): # XXX toeid
                 continue
             if attr in self.no_detailed_change_attrs:
                 msg = _('%s updated') % _(attr)
@@ -178,8 +178,8 @@
         return context
 
     def subject(self):
-        entity = self.entity(self.row or 0, self.col or 0)
-        return  u'%s #%s (%s)' % (self.req.__('Updated %s' % entity.e_schema),
+        entity = self.cw_rset.get_entity(self.cw_row or 0, self.cw_col or 0)
+        return  u'%s #%s (%s)' % (self._cw.__('Updated %s' % entity.e_schema),
                                   entity.eid, self.user_data['login'])
 
 
--- a/web/views/basecomponents.py	Wed Jan 13 16:00:42 2010 +0100
+++ b/web/views/basecomponents.py	Wed Jan 13 16:01:34 2010 +0100
@@ -223,7 +223,7 @@
 
     def cell_call(self, row, col, view):
         entity = self.cw_rset.get_entity(row, col)
-        url = entity.absolute_url(vid=view.id, __template='pdf-main-template')
+        url = entity.absolute_url(vid=view.__regid__, __template='pdf-main-template')
         iconurl = self._cw.build_url('data/pdf_icon.gif')
         label = self._cw._('Download page as pdf')
         self.w(u'<a href="%s" title="%s" class="toolbarButton"><img src="%s" alt="%s"/></a>' %
cubicweb