Bug: 14501 Allow importing when user has edit perms.

horde · Nov 6, 2016 · 08f3a4e · 08f3a4e
1 parent f8afeea
commit 08f3a4e
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 10 deletions.
diff --git a/kronolith/js/kronolith.js b/kronolith/js/kronolith.js
@@ -3173,12 +3173,14 @@ KronolithCore = {
             }
             $('kronolithCalendar' + type + 'Color').setValue(color).setStyle({ backgroundColor: color, color: Color.brightness(Color.hex2rgb(color)) < 125 ? '#fff' : '#000' });
             form.down('.kronolithCalendarDelete').hide();
+            $('kronolithCalendarinternalImportButton').hide();
         } else {
             info = Kronolith.conf.calendars[type][calendar];
 
             $('kronolithCalendar' + type + 'Id').setValue(calendar);
             $('kronolithCalendar' + type + 'Name').setValue(info.name);
             $('kronolithCalendar' + type + 'Color').setValue(info.bg).setStyle({ backgroundColor: info.bg, color: info.fg });
+            $('kronolithCalendarinternalImportButton').hide();
 
             switch (type) {
             case 'internal':
@@ -3289,6 +3291,7 @@ KronolithCore = {
                         if (info.del) {
                             $('kronolithCalendarinternalImportOver').enable();
                         }
+                        $('kronolithCalendarinternalImportButton').show().enable();
                     }
                 }
                 HordeImple.AutoCompleter.kronolithCalendarinternalTags.disable();
@@ -3796,6 +3799,24 @@ KronolithCore = {
         return true;
     },
 
+    calendarImport: function(form, disableForm)
+    {
+        if ($F('kronolithCalendarinternalImport')) {
+            HordeCore.notify(Kronolith.text.import_warning, 'horde.message');
+            this.loading++;
+            $('kronolithLoading').show();
+            var name = 'kronolithIframe' + Math.round(Math.random() * 1000),
+                iframe = new Element('iframe', { src: 'about:blank', name: name, id: name }).setStyle({ display: 'none' });
+            document.body.insert(iframe);
+            form.enable();
+            form.target = name;
+            form.submit();
+            if (disableForm) {
+                form.disable();
+            }
+        }
+    },
+
     /**
      * Callback method after saving a calendar.
      *
@@ -3814,16 +3835,7 @@ KronolithCore = {
             delete data.calendar;
         }
         if (r.saved) {
-            if ($F('kronolithCalendarinternalImport')) {
-                HordeCore.notify(Kronolith.text.import_warning, 'horde.message');
-                this.loading++;
-                $('kronolithLoading').show();
-                var name = 'kronolithIframe' + Math.round(Math.random() * 1000),
-                    iframe = new Element('iframe', { src: 'about:blank', name: name, id: name }).setStyle({ display: 'none' });
-                document.body.insert(iframe);
-                form.target = name;
-                form.submit();
-            }
+            this.calendarImport(form, false);
             var cal = r.calendar, id;
             if (data.calendar) {
                 var color = {
@@ -4958,6 +4970,10 @@ KronolithCore = {
                 $('kronolithEventUrl').show();
                 e.stop();
                 return;
+            case 'kronolithCalendarinternalImportButton':
+                // Used when user has edit perms to a shared calendar.
+                this.calendarImport(elt.up('form'), true);
+                break;
             }
 
             // Caution, this only works if the element has definitely only a

diff --git a/kronolith/templates/chunks/calendar.php b/kronolith/templates/chunks/calendar.php
@@ -150,6 +150,7 @@
                  '<label for="kronolithCalendarinternalImportOver">', '</label>') ?>
     <span class="kronolithDialogWarning"><?php printf(_("%sWarning:%s also %sdeletes all events%s currently in the calendar."), '<strong>', '</strong>', '<strong>', '</strong>') ?></span>
   </div>
+  <input id="kronolithCalendarinternalImportButton" type="button" value="<?php echo _("Import") ?>" class="kronolithCalendarImport button" style="display:none;" />
 </div>
 
 <div id="kronolithCalendarinternalTabExport" class="kronolithTabsOption" style="display:none">