diff options
| author | Tim Almdal <tnalmdal@shaw.ca> | 2010-07-07 08:58:38 -0700 |
|---|---|---|
| committer | Tim Almdal <tnalmdal@shaw.ca> | 2010-07-07 08:58:38 -0700 |
| commit | 9538b3888dadbe3a6fac72e2a97f97c7db3d86f2 (patch) | |
| tree | 5e0e5822115e2c4fa3b1d1e0cfa3d294c6382fcb /lib/gallery.dialog.js | |
| parent | cb4e18f9dddd82a283f0208c694a9b4eb1a2eaca (diff) | |
Fix for ticket #1176. Have the gallery.dialog code add a g-in-dialog parameter to the url to let the controller know its in a dialog. The reauthenticate controller will format the password prompt as a page or a form content. If authentication is successful, then the original controller is called instead of being redirected to.
Diffstat (limited to 'lib/gallery.dialog.js')
| -rw-r--r-- | lib/gallery.dialog.js | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/gallery.dialog.js b/lib/gallery.dialog.js index 1e91e3ae..e6bd7392 100644 --- a/lib/gallery.dialog.js +++ b/lib/gallery.dialog.js @@ -27,7 +27,8 @@ $("#g-dialog").gallery_show_loading(); - $.getJSON(sHref, function(data) { + var url = sHref + (sHref.indexOf("?") == -1 ? "?" : "&") + "g-in-dialog"; + $.getJSON(url, function(data) { $("#g-dialog").html(unescape(data.form)).gallery_show_loading(); if ($("#g-dialog form").length) { |