Changeset 9cb3deb in indico

Timestamp:

10/04/10 17:17:54 (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, d9941f8582b36b24821a11ea5ba16fda6a457fb1

Children:

a98b71

Parents:

5b4690

git-author:

csvetelina.angelova@…> (02/03/10 09:32:38)

git-committer:

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

Message:

[FIX] - disable Adding Materail during reviewing

• the widget is changed in order the link for adding material to be not visible if there is a reviewing process going on.
• if the type of material is reviewing - it is not shown.

Location:

indico

Files:

• MaKaC/webinterface/tpls/ShowExistingReviewingMaterial.tpl (modified) (2 diffs)
• htdocs/js/indico/MaterialEditor/Editor.js (modified) (4 diffs)

indico/MaKaC/webinterface/tpls/ShowExistingReviewingMaterial.tpl

@@ -4 +4 @@
 <div id="reviewingMaterialListPlace"><!-- DOM-filled materials list --></div>
 <span id="container"></span>
-
                                    
 <script type="text/javascript">
@@ -17 +16 @@
     };
     var uploadAction = Indico.Urls.UploadAction.contribution;
+    var visibility = '';
+                                 <% if  self._target.getConference().getConfReview().getChoice() == 3: %> 
+                                    <% if not self._target.getReviewManager().getLastReview().getEditorJudgement().isSubmitted():%>
+                                        visibility = 'visible';
+                                    <% end %>
+                                    <% else: %>
+                                        visibility = 'hidden';
+                                    <% end %>
+                                <% end %>
+                                <% if self._target.getConference().getConfReview().getChoice() == 2: %>
+                                    <% if not (self._target.getReviewManager().getLastReview().getRefereeJudgement().isSubmitted() or self._target.getReviewManager().getLastReview().anyReviewerHasGivenAdvice()): %>
+                                        visibility = 'visible';
+                                    <% end %>
+                                    <% else: %>
+                                        visibility = 'hidden';
+                                    <% end %>
+                                <% end %>
+                                <% if  self._target.getConference().getConfReview().getChoice() == 4: %>
+                                    <% if not (self._target.getReviewManager().getLastReview().getRefereeJudgement().isSubmitted() or self._target.getReviewManager().getLastReview().anyReviewerHasGivenAdvice() or self._target.getReviewManager().getLastReview().getEditorJudgement().isSubmitted()): %>                              
+                                        visibility = 'visible';
+                                    <% end %>
+                                    <% else: %>
+                                        visibility = 'hidden';
+                                    <% end %>
+                                <% end %>
+    
     
 var mlist = new ReviewingMaterialListWidget(args, <%= RHSubmitMaterialBase._allowedMatsforReviewing %>, uploadAction);

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

@@ -1575 +1575 @@
         
         var item = [
-            IndicoUI.Buttons.arrowExpandIcon(matWidgetDiv, true),
-            $B(Html.span({}),material.accessor('title')),
-            menu,
-            $B(Html.div("descriptionLine"), material.accessor('description')),
+             // not to be shown the type of material if it is "reviewing"
+            //IndicoUI.Buttons.arrowExpandIcon(matWidgetDiv, true),
+            //$B(Html.span({}),material.accessor('title')),
+            //menu,
+            //$B(Html.div("descriptionLine"), material.accessor('description')),
             matWidgetDiv
         ];}
@@ -1585 +1586 @@
         
     },
+    
+   
 
     /* _getReviewingStateImage : function(reviewingState) {
@@ -1654 +1657 @@
 
         var self = this;
-
-
+        
         $O(self.source).each(function(value, key){
             var obj = watchize(value);
             self.set(key, obj);
         });
+                
+        var link = Widget.link(command(function(){
+                    IndicoUI.Dialogs.Material.add(self.args,
+                                                  self,
+                                                  self.types,
+                                                  self.uploadAction,
+                                                  function(info) {
+                                                      if (self.get(info.material)) {
+                                                          self.get(info.material).get('resources').append(watchize(info));
+                                                      } else {
+                                                          self._loadMaterial(info.material);
+                                                      }
+                                                  });
+                }, $T("Add Material")));
         
         
-        var link = Widget.link(command(function(){
-            IndicoUI.Dialogs.Material.add(self.args,
-                                          self,
-                                          self.types,
-                                          self.uploadAction,
-                                          function(info) {
-                                              if (self.get(info.material)) {
-                                                  self.get(info.material).get('resources').append(watchize(info));
-                                              } else {
-                                                  self._loadMaterial(info.material);
-                                              }
-                                          });
-        }, $T("Add Material")));
         
         return Html.div(
             {},
-            Html.div({style:{textAlign: 'left'}}, link),
+            Html.div({style:{textAlign: 'left', visibility: visibility}}, link),
             Html.div({style:{overflow: 'auto', width: self.width, height: self.height}},
                      this.ListWidget.prototype.draw.call(this))
@@ -1685 +1688 @@
 },
 
-     function(args, types, uploadAction, width, height) {
+     function(args, types, uploadAction, width, height, visibility) {
          var self = this;
          this.width = width;
          this.height = height;
+         this.visibility = visibility;
          this.args = args;
          this.types = types;