Changeset d26b95 in indico

Timestamp:

04/26/12 12:14:48 (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:

50136d

Parents:

8e2f05

git-author:

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

git-committer:

Jose Benito <jose.benito.gonzalez@…> (04/26/12 12:14:48)

Message:

[FIX] Final judgement show reviewers history

Location:

indico/MaKaC/webinterface

Files:

• pages/contributionReviewing.py (modified) (3 diffs)
• tpls/ContributionReviewingJudgements.tpl (modified) (1 diff)

indico/MaKaC/webinterface/pages/contributionReviewing.py

@@ -123 +123 @@
         return wc.getHTML( pars )
 
-class WContributionReviewingJudgements(wcomponents.WTemplated):
+class WContributionReviewingBase(wcomponents.WTemplated):
+
+    def _getStatusClass( self, judgement ):
+        if judgement == "Accept":
+            return "contributionReviewingStatusAccepted"
+        elif judgement == "Reject":
+            return "contributionReviewingStatusRejected"
+        elif judgement == "To be corrected":
+            return "contributionReviewingStatusCorrected"
+        else:
+            return "contributionReviewingStatusCorrected"
+
+    def _getStatusText( self, judgement ):
+        if judgement == "Accept":
+            return _("ACCEPTED")
+        elif judgement == "Reject":
+            return _("REJECTED")
+        elif judgement == "To be corrected":
+            return _("To be corrected")
+        else:
+            return judgement
+
+class WContributionReviewingJudgements(WContributionReviewingBase):
 
     def __init__(self, conference, aw):
@@ -152 +174 @@
         vars["Review"] = self.__target.getReviewManager().getLastReview()
         vars["TrackList"] = self._conf.getTrackList()
+        vars["getStatusClass"] = lambda judgement: self._getStatusClass(judgement)
+        vars["getStatusText"] = lambda judgement: self._getStatusText(judgement)
 
         return vars
@@ -233 +257 @@
         return wc.getHTML({"ShowReviewingTeam" : True})
 
-class WContributionReviewingHistory(wcomponents.WTemplated):
+class WContributionReviewingHistory(WContributionReviewingBase):
 
     def __init__(self, contribution):
         self._contribution = contribution
         self._conf = contribution.getConference()
-
-    def _getStatusClass( self, judgement ):
-        if judgement == "Accept":
-            return "contributionReviewingStatusAccepted"
-        elif judgement == "Reject":
-            return "contributionReviewingStatusRejected"
-        elif judgement == "To be corrected":
-            return "contributionReviewingStatusCorrected"
-        else:
-            return "contributionReviewingStatusCorrected"
-
-    def _getStatusText( self, judgement ):
-        if judgement == "Accept":
-            return _("ACCEPTED")
-        elif judgement == "Reject":
-            return _("REJECTED")
-        elif judgement == "To be corrected":
-            return _("To be corrected")
-        else:
-            return judgement
 
     def getHTML( self, params ):

indico/MaKaC/webinterface/tpls/ContributionReviewingJudgements.tpl

@@ -65 +65 @@
                     <table cellspacing="0" cellpadding="5" width="100%">
                     % for advice in AdviceList:
-                        <%include file="AdviceJudgementDisplay.tpl" args="advice = advice, ShowReviewer = True, format=format"/>
+                        <%include file="AdviceJudgementDisplay.tpl" args="Advice = advice, ShowReviewer = True, format=format"/>
                     % endfor
                     </table>