Changeset 245d99 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, 0da0c1403bae8e51d8229f460181c71b9e6dda72

Children:

be54ff6

Parents:

dca762d

git-author:

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

git-committer:

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

Message:

[FIX] Fix Material Review handling

Location:

indico

Files:

• MaKaC/services/implementation/material.py (modified) (1 diff)
• htdocs/js/indico/MaterialEditor/Editor.js (modified) (7 diffs)

indico/MaKaC/services/implementation/material.py

@@ -227 +227 @@
             reviewManager = self._target.getReviewManager()
             matList[rev.getId()] = rev.fossilize(IMaterialFossil)
-            matList[rev.getId()]["canReviewModify"] = (self._target.canModify(self.getAW()) \
-                                                       or self._target.getConference().getConfPaperReview().isPaperReviewManager(self.getAW().getUser()) \
-                                                       or reviewManager.isReferee(self._getUser()) or reviewManager.isEditor(self._getUser())) \
-                                                       and (rev.getReviewingState() == 3 if rev else False)
             matList[rev.getId()]["isUnderReview"] = rev.getReviewingState() == 2 and len(reviewManager.getVersioning()) > 1
         return matList

indico/htdocs/js/indico/MaterialEditor/Editor.js

@@ -1358 +1358 @@
         };
 
-        var reviewingState = material.get('reviewingState');
         var menu;
 
@@ -1380 +1379 @@
 
         args.materialProtection = material.get('protection');
-        var matWidget = new ResourceListWidget(material.get('resources'), args, material.get('title'), self.types, self.showMainResources, material.get('canReviewModify'));
+        var matWidget = new ResourceListWidget(material.get('resources'), args, material.get('title'), self.types, self.showMainResources, self.canReviewModify);
 
         // check whenever a material gets empty (no resources) and delete it
@@ -1415 +1414 @@
                 matWidgetDiv
             ];
-        } else if(material.get('reviewingState') > 2 || self.isUserSubmission){
+        } else if(material.get('reviewingState') > 2 || self.canReviewModify){
             item = [matWidgetDiv];
         } else {
@@ -1531 +1530 @@
 },
 
-     function(args, types, uploadAction, width, height, showMainResources, listMethod, isUserSubmission) {
+     function(args, types, uploadAction, width, height, showMainResources, listMethod, canReviewModify) {
          var self = this;
          this.width = width;
@@ -1542 +1541 @@
              listMethod = 'material.list';
          }
-         this.isUserSubmission = any(isUserSubmission, false);
+         this.canReviewModify = any(canReviewModify, false);
 
          this.RemoteWidget(listMethod, args);
@@ -1573 +1572 @@
                 }, $T("Upload paper")));
         var visibility = "hidden";
-        if(self.visible){
+        if(self.canReviewModify){
             visibility = "visible";
         }
@@ -1584 +1583 @@
     }
 },
-     function(args, types, uploadAction, width, height, visible, sendToReviewButton, textHasMaterials) {
+     function(args, types, uploadAction, width, height, canReviewModify, sendToReviewButton, textHasMaterials) {
          var self = this;
-         this.MaterialListWidget(args, types, uploadAction, width, height, false, 'material.reviewing.list', visible);
-         this.visible = visible;
+         this.MaterialListWidget(args, types, uploadAction, width, height, false, 'material.reviewing.list', canReviewModify);
+         this.canReviewModify = canReviewModify;
          this.sendToReviewButton = sendToReviewButton;
          this.textHasMaterials = textHasMaterials;