diff options
| author | Marvin Thomas Rabe <m.rabe@echtzeitraum.de> | 2011-10-04 19:37:54 +0200 |
|---|---|---|
| committer | Marvin Thomas Rabe <m.rabe@echtzeitraum.de> | 2011-10-04 19:37:54 +0200 |
| commit | 340f6bbaba62af6079cfa9485e458d2917bbe5e8 (patch) | |
| tree | b2d36be3b8fab6acae3286a4e49c46d15556711d /apps/calendar | |
| parent | d1518f29018151d6116ba34628fc354ac1d4102a (diff) | |
| parent | 70091ec649b463e204dd2b6225d266bd79af63a2 (diff) | |
| download | nextcloud-server-340f6bbaba62af6079cfa9485e458d2917bbe5e8.tar.gz nextcloud-server-340f6bbaba62af6079cfa9485e458d2917bbe5e8.zip | |
Merge branch 'master' of gitorious.org:owncloud/owncloud
Diffstat (limited to 'apps/calendar')
| -rw-r--r-- | apps/calendar/templates/part.import.php | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/apps/calendar/templates/part.import.php b/apps/calendar/templates/part.import.php index c1beb49a7f7..37493674371 100644 --- a/apps/calendar/templates/part.import.php +++ b/apps/calendar/templates/part.import.php @@ -58,13 +58,18 @@ function importcal(importtype){ var file = $("#filename").val(); if(importtype == "existing"){ var calid = $("input:radio[name='calendar']:checked").val(); - $.getJSON(OC.filePath('calendar', '', 'import.php') + "?import=existing&calid=" + calid + "&path=" + path + "&file=" + file); + $.getJSON(OC.filePath('calendar', '', 'import.php') + "?import=existing&calid=" + calid + "&path=" + path + "&file=" + file, function(){ + $("#importdialog").dialog('destroy').remove(); + $("#importdialogholder").remove(); + }); } if(importtype == "new"){ var calname = $("#displayname").val(); var description = $("#description").val(); - $.post(OC.filePath('calendar', '', 'import.php'), {'import':'new', 'calname':calname, 'description':description, 'path':path, 'file':file}); + $.post(OC.filePath('calendar', '', 'import.php'), {'import':'new', 'calname':calname, 'description':description, 'path':path, 'file':file}, function(){ + $("#importdialog").dialog('destroy').remove(); + $("#importdialogholder").remove(); + }); } - window.location = oc_webroot + "/apps/calendar/"; } </script>
\ No newline at end of file |