Merge remote branch 'gallery3/master'

2 files changed, 9 insertions, 1 deletions

diff --git a/modules/organize/lib/Gallery3WebClient.swf b/modules/organize/lib/Gallery3WebClient.swf
index b82c8a42..356a1a2f 100644
--- a/modules/organize/lib/Gallery3WebClient.swf
+++ b/modules/organize/lib/Gallery3WebClient.swf
diff --git a/modules/organize/views/organize_dialog.html.php b/modules/organize/views/organize_dialog.html.php
index b76813ad..3ea1143d 100644
--- a/modules/organize/views/organize_dialog.html.php
+++ b/modules/organize/views/organize_dialog.html.php
@@ -19,13 +19,21 @@
 <script type="text/javascript">
   $("#g-dialog").bind("dialogclose", function(event, ui) {
     // @todo do a call to organize/closing to end the batch
-    window.location.reload();
+    if ($(this).data("reload.location")) {
+      window.location = $(this).data("reload.location");
+    } else {
+      window.location.reload();
+    }
   });
 
   function closeOrganizeDialog() {
     $("#g-dialog").dialog("close");
   }
 
+  function setLocation(url) {
+    $("#g-dialog").data("reload.location", url);
+  }
+
   function setTitle(title) {
     $("#ui-dialog-title-g-dialog").text(<?= t("Organize :: ")->for_js() ?> + title);
   }