Changeset 6e2ea5 in indico

Timestamp:

06/08/10 11:33:35 (3 years ago)

Author:

Jose Benito <jose.benito.gonzalez@…>

Branches:

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

Children:

fa6855

Parents:

7a718e

git-author:

Pedro Ferreira <jose.pedro.ferreira@…> (06/01/10 12:27:42)

git-committer:

Jose Benito <jose.benito.gonzalez@…> (06/08/10 11:33:35)

Message:

[FIX] Vidyo: Allow creation of only one booking

• Error message otherwise;
• Added entension point that allows pre-check before opening booking dialog;

Location:

indico

Files:

• MaKaC/plugins/Collaboration/Vidyo/tpls/Main.js (modified) (1 diff)
• htdocs/css/Default.css (modified) (1 diff)
• htdocs/js/indico/Collaboration/Collaboration.js (modified) (1 diff)
• htdocs/js/indico/Core/Dialogs/Popup.js (modified) (1 diff)

indico/MaKaC/plugins/Collaboration/Vidyo/tpls/Main.js

@@ -174 +174 @@
     },
 
+    beforeCreate: function(pluginName, conferenceId) {
+        var allowCreation = true;
+        each(bookings, function(booking) {
+            if (booking.type == 'Vidyo') {
+                allowCreation = false;
+            }
+        });
+
+        if (!allowCreation) {
+            CSErrorPopup($T("Whoops..."),
+                         [Html.unescaped.div({},
+                                   $T("There is already a Vidyo booking present. " +
+                                      "Right now it is only possible to create " +
+                                      "<strong>a single Vidyo booking per event</strong>. " +
+                                      "Please delete it if you want to create a new one."))]);
+        }
+
+        return allowCreation;
+    },
+
     postCreate: function(booking) {
     },

indico/htdocs/css/Default.css

@@ -3816 +3816 @@
 
 .errorList {
-    color: #881122;
+    width: 400px;
 }
 

indico/htdocs/js/indico/Collaboration/Collaboration.js

@@ -1223 +1223 @@
  */
 var createBooking = function(pluginName, conferenceId) {
+    // Code that has to be executed before the dialog is presented
+    if (pluginHasFunction(pluginName, "beforeCreate")) {
+        // let the function define whether we're going to draw the
+        // dialog or not
+        if (!codes[pluginName].beforeCreate(pluginName, conferenceId)) {
+            return false;
+        }
+    }
 
     var popup = new BookingPopup('create', pluginName, null, conferenceId);
     popup.open();
+
     if (pluginHasFunction(pluginName, "onCreate")) {
         codes[pluginName].onCreate(popup);
     }
     popup.postDraw();
+
+    return true;
 }
 

indico/htdocs/js/indico/Core/Dialogs/Popup.js

@@ -571 +571 @@
              var errorList = null;
              if (this.errors.length == 1) {
-                 errorList = Html.span({className:"errorList"}, this.errors[0]);
+                 errorList = Html.div({className:"errorList"}, this.errors[0]);
              }else{
                  errorList = Html.ul("errorList");