Changeset 032d31 in indico

Timestamp:

08/12/10 14:06: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:

de2a21

Parents:

90bdb9

git-author:

Leszek Syroka <leszek.marek.syroka@…> (07/15/10 16:37:02)

git-committer:

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

Message:

[FIX] Collaboration plugin adding rooms

• there is a possibility to pass a callback function to indicoSource to enhance code synchronization
• rooms in collaboration plugin can be now added
• fix#475

Location:

indico

Files:

• MaKaC/webinterface/tpls/AdminPluginsOptionList.tpl (modified) (3 diffs)
• htdocs/js/indico/Core/Widgets/Inline.js (modified) (2 diffs)
• htdocs/js/presentation/Data/Remote.js (modified) (2 diffs)

indico/MaKaC/webinterface/tpls/AdminPluginsOptionList.tpl

@@ -75 +75 @@
                     <div id="roomAddButton"></div>
                     <script type="text/javascript">
+                        var callback = function(){
+                            $E('roomChooser').set(roomChooser.draw(),addRoomButton);
+                        }
+
                         var removeRoomHandler = function (roomToRemove,setResult){
                             indicoRequest(
@@ -102 +106 @@
                         <% if rbActive: %>
 
-                            var roomChooser = new SelectRemoteWidget('roomBooking.locationsAndRooms.list', {})
+                            var roomChooser = new SelectRemoteWidget('roomBooking.locationsAndRooms.list', {}, callback);
                             var addRoomButton = Html.input("button", {style:{marginRight: pixels(5)}}, $T('Add Room') );
                             addRoomButton.observeClick(
@@ -121 +125 @@
                                     );
                             });
-                            $E('roomChooser').set(roomChooser.draw(),addRoomButton);
                             $E('roomAddButton').set();
                         <% end %>

indico/htdocs/js/indico/Core/Widgets/Inline.js

@@ -65 +65 @@
       * server automatically?
       */
-     function(method, attributes, loadOnStartup) {
+     function(method, attributes, loadOnStartup, callback) {
          loadOnStartup = exists(loadOnStartup)?loadOnStartup:true;
          this.ready = new WatchValue();
          this.ready.set(false);
          this.loadOnStartup = loadOnStartup;
-         this.source = indicoSource(method, attributes, null, !loadOnStartup);
+         this.source = indicoSource(method, attributes, null, !loadOnStartup, callback);
      });
 
@@ -427 +427 @@
 
      },
-     function(method, args) {
+     function(method, args, callback) {
          this.options = new WatchObject();
          this.select = Html.select({});
          this.selected = new WatchValue();
          // Load data source on startup
-         this.InlineRemoteWidget(method, args, true);
+         this.InlineRemoteWidget(method, args, true, callback);
+         this.loadOnStartup = false;
      });
 

indico/htdocs/js/presentation/Data/Remote.js

@@ -113 +113 @@
  * @return {WatchAccessor} value
  */
-function jsonRpcValue(url, method, params, def, dontStart) {
+function jsonRpcValue(url, method, params, def, dontStart, callback) {
         // not an object for url... curry
         var self = new Source();
@@ -132 +132 @@
                                 error: null
                         });
+
+                        if(callback) {
+                            callback();
+                        }
                 }
         }