summaryrefslogtreecommitdiffstats
path: root/apps/calendar/js
diff options
context:
space:
mode:
authorGeorg Ehrke <dev@georgswebsite.de>2012-06-30 23:18:41 +0200
committerGeorg Ehrke <dev@georgswebsite.de>2012-06-30 23:18:41 +0200
commitce331bd1d39192d5a062f27c2a63af581063e0b6 (patch)
tree8c1f4efcdd890a396f745a0ba40cc240321dec9b /apps/calendar/js
parenta705b19cd598b538d0b82d97166d5d0ba03ff835 (diff)
downloadnextcloud-server-ce331bd1d39192d5a062f27c2a63af581063e0b6.tar.gz
nextcloud-server-ce331bd1d39192d5a062f27c2a63af581063e0b6.zip
improvements for dropoimport
Diffstat (limited to 'apps/calendar/js')
-rw-r--r--apps/calendar/js/calendar.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/apps/calendar/js/calendar.js b/apps/calendar/js/calendar.js
index 0c4d44769cd..aaf168844ea 100644
--- a/apps/calendar/js/calendar.js
+++ b/apps/calendar/js/calendar.js
@@ -635,12 +635,12 @@ Calendar={
$.post(OC.filePath('calendar', 'ajax/import', 'dropimport.php'), {'data':data},function(result) {
if(result.status == 'success'){
$('#calendar_holder').fullCalendar('addEventSource', result.eventSource);
- $('#notification').html(result.count + ' Events has been saved in the new calendar ' + result.newcalendarname);
+ $('#notification').html(result.message);
$('#notification').slideDown();
window.setTimeout(function(){$('#notification').slideUp();}, 5000);
return true;
}else{
- $('#notification').html('ownCloud wasn\'t able to import at least one file. File skipped.');
+ $('#notification').html(result.message);
$('#notification').slideDown();
window.setTimeout(function(){$('#notification').slideUp();}, 5000);
}