summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeorg Ehrke <georg.stefan.germany@googlemail.com>2011-10-04 10:17:11 +0200
committerGeorg Ehrke <georg.stefan.germany@googlemail.com>2011-10-04 10:17:11 +0200
commit33b660857a5ed9a939de97d6187e07c6e5a92486 (patch)
tree4597744e830f0599cd071aae58f280efb611b834
parent77e12a15b1cffcaf3c152bf394fd15eb61d24ace (diff)
downloadnextcloud-server-33b660857a5ed9a939de97d6187e07c6e5a92486.tar.gz
nextcloud-server-33b660857a5ed9a939de97d6187e07c6e5a92486.zip
fix ical import
-rw-r--r--apps/calendar/templates/part.import.php11
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