Changeset 511011 in indico

Timestamp:

10/04/10 17:17:56 (3 years ago)

Author:

Jose Benito <jose.benito.gonzalez@…>

Branches:

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

Children:

e5cb23

Parents:

2cc959

git-author:

csvetelina.angelova@…> (03/01/10 15:12:42)

git-committer:

Jose Benito <jose.benito.gonzalez@…> (10/04/10 17:17:56)

Message:

[IMP] - if no Comments - "None" in the field

• Giving Judgement(for all reviewers): if there are no Comments - "None" in the field

Location:

indico/MaKaC/webinterface

Files:

• pages/contributions.py (modified) (2 diffs)
• tpls/ContributionReviewingJudgements.tpl (modified) (1 diff)
• tpls/GiveAdvice.tpl (modified) (2 diffs)
• tpls/JudgeEditing.tpl (modified) (1 diff)

indico/MaKaC/webinterface/pages/contributions.py

@@ -416 +416 @@
             if (confReviewChoice == 3 or confReviewChoice == 4) and \
                 self._contrib.getReviewManager().isEditor(self._rh._getUser()) and \
-<<<<<<< HEAD:indico/MaKaC/webinterface/pages/contributions.py
                 (not self._contrib.getReviewManager().getLastReview().getRefereeJudgement().isSubmitted() or confReviewChoice == 3) and \
                 self._contrib.getReviewManager().getLastReview().isAuthorSubmitted():
-<<<<<<< HEAD:indico/MaKaC/webinterface/pages/contributions.py
-
-                self._tabJudgeEditing = self._tabCtrl.newTab( "editing", "Editing", \
-=======
-=======
-                (not self._contrib.getReviewManager().getLastReview().getRefereeJudgement().isSubmitted() or confReviewChoice == 3):
->>>>>>> [IMP] - if materials not submitted - no exception:indico/MaKaC/webinterface/pages/contributions.py
                 
                 self._tabJudgeEditing = self._subtabReviewing.newSubTab( "editing", "Judge Layout", \
->>>>>>> [DEVELOPMENT] - new subtabs + other:indico/MaKaC/webinterface/pages/contributions.py
-                                         urlHandlers.UHContributionEditingJudgement.getURL(self._target) )
+                urlHandlers.UHContributionEditingJudgement.getURL(self._target) )
 
             if (confReviewChoice == 2 or confReviewChoice == 4) and \
@@ -471 +462 @@
             banner = wcomponents.WContribListBannerModif(self._target).getHTML()
         body = wcomponents.WTabControl( self._tabCtrl, self._getAW() ).getHTML( self._getTabContent( params ) )
-<<<<<<< HEAD:indico/MaKaC/webinterface/pages/contributions.py
         return banner + body
 
-=======
         if not self._canModify or self._isPRM:
             return body
         else:
             return banner + body
-    
->>>>>>> [FIXES] - task #108 + small layout fixes:indico/MaKaC/webinterface/pages/contributions.py
+
 
 class WPContribModifMain( WPContributionModifBase ):

indico/MaKaC/webinterface/tpls/ContributionReviewingJudgements.tpl

@@ -213 +213 @@
             function(result, error){
                 if (!error) {
-                    $E('inPlaceEditComments').set(result)
-                    $E('commentsMessage').set('')
+                    if(result.length == 0){
+                        $E('inPlaceEditComments').set($T('No comments given.'));
+                    } else {
+                        $E('inPlaceEditComments').set(result)
+                    }
                 }
             }

indico/MaKaC/webinterface/tpls/GiveAdvice.tpl

@@ -59 +59 @@
         </td>
     </tr>   
-<% end %>    
 </table>
 
@@ -129 +128 @@
             function(result, error){
                 if (!error) {
-                    $E('inPlaceEditComments').set(result)
-                    $E('commentsMessage').set('')
+                    if(result.length == 0){
+                        $E('inPlaceEditComments').set($T('No comments given.'));
+                    } else {
+                        $E('inPlaceEditComments').set(result)
+                    }
                 }
             }

indico/MaKaC/webinterface/tpls/JudgeEditing.tpl

@@ -138 +138 @@
             function(result, error){
                 if (!error) {
-                    $E('inPlaceEditComments').set(result);
+                    if(result.length == 0){
+                        $E('inPlaceEditComments').set($T('No comments given.'));
+                    } else {
+                        $E('inPlaceEditComments').set(result)
+                    }
                 }
             }