Changeset eecd42 in indico

Timestamp:

05/19/11 10:38:14 (2 years ago)

Author:

Pedro Ferreira <jose.pedro.ferreira@…>

Branches:

master, burotel, hello-world-walkthrough, ipv6, v0.98-series, v0.98.2, v0.98.3, v0.98b1, v0.98b2, v0.99, 051b2622c51afb171a1dedb46a0df4fbb0cbd02e, d9941f8582b36b24821a11ea5ba16fda6a457fb1

Children:

f4c27d

Parents:

e8a463

git-author:

Alexis Castilla Hernandez <alexis.castilla.hernandez@…> (05/13/11 17:37:24)

git-committer:

Pedro Ferreira <jose.pedro.ferreira@…> (05/19/11 10:38:14)

Message:

[IMP] Allow authors and co-authors see abstracts

• Implemented to allow authors and co-authors see the abstracts in "View my abstracts" section in which they are participants
• Added check protection method to allow access the abstract
• Using email as key
• Fixed a bug with the contribution type name in the list of abstracts
• Ticket #765

Location:

indico/MaKaC

Files:

• review.py (modified) (1 diff)
• webinterface/pages/abstracts.py (modified) (2 diffs)
• webinterface/rh/CFADisplay.py (modified) (1 diff)

indico/MaKaC/review.py

@@ -937 +937 @@
                     res.append( abstract )
         return res
+
+    def getAbstractListForPrimaryAuthorEmail(self, email):
+        ''' Get list of abstracts where the email belongs to a primary author
+        '''
+        res = []
+        for abs in self._abstracts.values():
+            for author in abs.getPrimaryAuthorList():
+                if email == author.getEmail():
+                    res.append(abs)
+        return res
+
+    def getAbstractListForCoAuthorEmail(self, email):
+        ''' Get list of abstracts where the email belongs to a co-author
+        '''
+        res = []
+        for abs in self._abstracts.values():
+            for author in abs.getCoAuthorList():
+                if email == author.getEmail():
+                    res.append(abs)
+        return res
+
+    def isInAuthorizedViewList(self, user, abstract):
+        ''' Check if the user is submitter, primary author or co-author of the abstract
+        '''
+        # Check if the user is a submitter
+        if abstract.isSubmitter(user):
+            return True
+        # Check if the user is a primary author
+        for author in abstract.getPrimaryAuthorList():
+            if user.getEmail() == author.getEmail():
+                return True
+        # Check if the user is a co-author
+        for author in abstract.getCoAuthorList():
+            if user.getEmail() == author.getEmail():
+                return True
+        return False
 
     def getNotificationTplList(self):

indico/MaKaC/webinterface/pages/abstracts.py

@@ -187 +187 @@
         tz = tzUtil.getDisplayTZ()
 
+        asPrimaryAuthor = cfaMgr.getAbstractListForPrimaryAuthorEmail(self._aw.getUser().getEmail())
+        asCoAuthor = cfaMgr.getAbstractListForCoAuthorEmail(self._aw.getUser().getEmail())
         l = cfaMgr.getAbstractListForAvatar( self._aw.getUser() )
+        for abs in asPrimaryAuthor:
+            if not abs in l:
+                l.append(abs)
+        for abs in asCoAuthor:
+            if not abs in l:
+                l.append(abs)
+
+        l = sorted(l, key=lambda i:int(i.getId()))
+
         if not l:
             vars["abstracts"] = _("""<tr>
@@ -204 +215 @@
                     statusLabel = _("ACCEPTED")
                     if status.getType() is not None and status.getType()!="":
-                        statusLabel="%s as %s"%(statusLabel,status.getType())
+                        statusLabel="%s as %s"%(statusLabel,status.getType().getName())
                 elif isinstance( status, review.AbstractStatusRejected ):
                     statusLabel = _("REJECTED")

indico/MaKaC/webinterface/rh/CFADisplay.py

@@ -536 +536 @@
 class RHAbstractDisplay( RHAbstractDisplayBase ):
     _uh = urlHandlers.UHAbstractDisplay
+
+    def _checkProtection(self):
+        if self._abstract is None:
+            raise MaKaCError( _("The abstract you are trying to access does not exist"))
+        if not self._conf.getAbstractMgr().isInAuthorizedViewList(self._getUser(), self._abstract):
+            RHAbstractSubmissionBase._checkProtection(self)
 
     def _processIfActive( self ):