Changeset dca762d in indico

Timestamp:

04/23/12 15:58:58 (13 months ago)

Author:

Jose Benito <jose.benito.gonzalez@…>

Branches:

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

Children:

245d99

Parents:

1a30a6

git-author:

Alberto Resco Perez <alberto.resco.perez@…> (04/23/12 11:26:31)

git-committer:

Jose Benito <jose.benito.gonzalez@…> (04/23/12 15:58:58)

Message:

[FIX] Allow reviewers edit review material.

Location:

indico/MaKaC

Files:

• services/implementation/material.py (modified) (1 diff)
• webinterface/rh/contribMod.py (modified) (3 diffs)
• webinterface/wcomponents.py (modified) (1 diff)

indico/MaKaC/services/implementation/material.py

@@ -103 +103 @@
             reviewingState = self._material.getReviewingState()
 
-            if (reviewingState < 3 and
+            if (reviewingState < 3 and # it means the papers has not been submitted yet (or not reviewing material)
                 owner.canUserSubmit(self._aw.getUser())):
                 # Submitters have access
+                return
+            # status = 3 means the paper is under review (submitted but not reviewed)
+            elif RCContributionPaperReviewingStaff.hasRights(self, contribution = owner, includingContentReviewer=False) and reviewingState == 3:
                 return
             elif owner.getSession() and \

indico/MaKaC/webinterface/rh/contribMod.py

@@ -71 +71 @@
 
     @staticmethod
-    def hasRights(request):
+    def hasRights(request, contribution = None, includingContentReviewer=True):
         """ Returns true if the user is a PRM, or a Referee / Editor / Reviewer of the target contribution
         """
@@ -77 +77 @@
         confPaperReview = request._target.getConference().getConfPaperReview()
         paperReviewChoice = confPaperReview.getChoice()
-        reviewManager = request._target.getReviewManager()
+        if contribution:
+            reviewManager = contribution.getReviewManager()
+        else:
+            reviewManager = request._target.getReviewManager()
         return (confPaperReview.isPaperReviewManager(user) or \
                (reviewManager.hasReferee() and reviewManager.isReferee(user)) or \
                ((paperReviewChoice == 3 or paperReviewChoice == 4) and reviewManager.hasEditor() and reviewManager.isEditor(user)) or \
-               ((paperReviewChoice == 2 or paperReviewChoice == 4) and request._target.getReviewManager().isReviewer(user)))
+               (includingContentReviewer and ((paperReviewChoice == 2 or paperReviewChoice == 4) and request._target.getReviewManager().isReviewer(user))))
 
 class RCContributionReferee(object):
@@ -610 +613 @@
             and (not material or material.getReviewingState() < 3):
             self._loggedIn = True
-        elif not (RCContributionPaperReviewingStaff.hasRights(self) and not self._target.getReviewManager().getLastReview().isAuthorSubmitted()):
+        elif not (RCContributionPaperReviewingStaff.hasRights(self, includingContentReviewer=False) and self._target.getReviewManager().getLastReview().isAuthorSubmitted()):
             RHSubmitMaterialBase._checkProtection(self)
         else:

indico/MaKaC/webinterface/wcomponents.py

@@ -5217 +5217 @@
         reviewManager = self._target.getReviewManager()
         vars["Contribution"] = self._target
-        vars["CanModify"] = (self._target.canModify(self._rh._aw) or RCPaperReviewManager.hasRights(self._rh) \
-                            or reviewManager.isReferee(self._rh._getUser()) or reviewManager.isEditor(self._rh._getUser())) \
-                            and (self._target.getReviewing().getReviewingState() == 3 if self._target.getReviewing() else False)
+        vars["CanModify"] = (self._target.getReviewing().getReviewingState() == 3 if self._target.getReviewing() else False) and \
+                            (self._target.canModify(self._rh._aw) or RCPaperReviewManager.hasRights(self._rh) \
+                            or reviewManager.isReferee(self._rh._getUser()) or reviewManager.isEditor(self._rh._getUser()))
 
         return vars