Changeset eeab9c in indico

Timestamp:

09/12/11 19:55:54 (21 months ago)

Author:

Pedro Ferreira <jose.pedro.ferreira@…>

Branches:

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

Children:

880a3e

Parents:

892b23

Message:

[FIX] Error condition on submission rights

• upload would fail;

Location:

indico/MaKaC/webinterface/rh

Files:

• conferenceBase.py (modified) (1 diff)
• contribMod.py (modified) (1 diff)
• subContribMod.py (modified) (1 diff)

indico/MaKaC/webinterface/rh/conferenceBase.py

@@ -226 +226 @@
     def _checkProtection(self):
         self._loggedIn = True
-        if self._getUser() == None:
+        if self._getUser() == None and (isinstance(self._target, Category) or not self._target.getConference().canKeyModify(self._aw)):
             self._loggedIn = False
         else:

indico/MaKaC/webinterface/rh/contribMod.py

@@ -1362 +1362 @@
         if self._target.canUserSubmit(self._aw.getUser()) \
             and (not material or material.getReviewingState() < 3):
-            return
-        if not (RCContributionPaperReviewingStaff.hasRights(self) and not self._target.getReviewManager().getLastReview().isAuthorSubmitted()):
+            self._loggedIn = True
+        elif not (RCContributionPaperReviewingStaff.hasRights(self) and not self._target.getReviewManager().getLastReview().isAuthorSubmitted()):
             RHSubmitMaterialBase._checkProtection(self)
-
+        else:
+            self._loggedIn = True
 
 class RHContributionSelectManagers(RHContribModifBaseSpecialSesCoordRights):

indico/MaKaC/webinterface/rh/subContribMod.py

@@ -245 +245 @@
         if self._target.canUserSubmit(self._aw.getUser()) \
             and (not material or material.getReviewingState() < 3):
+            self._loggedIn = True
             return
         RHSubmitMaterialBase._checkProtection(self)