fix unsharing of events

diff --git a/apps/calendar/ajax/share/unshare.php b/apps/calendar/ajax/share/unshare.php
index 25a0ef48fcf1da29284e1703a686864a3e07358e..5bedbaaf0a6cd63a3915b89c03f13d8c3f508ef7 100644 (file)
--- a/apps/calendar/ajax/share/unshare.php
+++ b/apps/calendar/ajax/share/unshare.php
@@ -34,7 +34,7 @@ if($sharetype == 'user' && !OC_User::userExists($sharewith)){
        OC_JSON::error(array('message'=>'group not found'));
        exit;
 }
-$success = OC_Calendar_Share::unshare(OC_User::getUser(), $sharewith, $sharetype, $id, (($idtype=='calendar') ? OC_Calendar_Share::CALENDAR : OC_Calendar_Share::Event));
+$success = OC_Calendar_Share::unshare(OC_User::getUser(), $sharewith, $sharetype, $id, (($idtype=='calendar') ? OC_Calendar_Share::CALENDAR : OC_Calendar_Share::EVENT));
 if($success){
        OC_JSON::success();
 }else{

diff --git a/apps/calendar/templates/share.dropdown.php b/apps/calendar/templates/share.dropdown.php
index 3ed75be636347476477da43a62c037b0ccb812c4..71556a6a21c7909bef9953491093557852613c8f 100644 (file)
--- a/apps/calendar/templates/share.dropdown.php
+++ b/apps/calendar/templates/share.dropdown.php
@@ -19,7 +19,7 @@ foreach($sharedelements as $sharedelement){
 ?>
 <strong><?php echo $l->t('Users');?>:</strong><br>
 <select id="share_user" title="<?php echo $l->t('select users');?>" data-placeholder="<?php echo $l->t('select users'); ?>">
-<option value=""></option> 
+<option value=""></option>
 <?php
 $allocusers = OC_User::getUsers();
 $allusers = array();
@@ -37,7 +37,7 @@ echo html_select_options($allusers, array());
        <script>
                $('#sharewithuser_<?php echo $user['share']; ?> > img').click(function(){
                        $('#share_user option[value="<?php echo $user['share']; ?>"]').removeAttr('disabled');
-                       Calendar.UI.Share.unshare(<?php echo $id; ?>, 'calendar', '<?php echo $user['share']; ?>', 'user');
+                       Calendar.UI.Share.unshare(<?php echo $id; ?>, '<?php echo (array_key_exists('calid', $_)?'calendar':'event');?>', '<?php echo $user['share']; ?>', 'user');
                        $('#sharewithuser_<?php echo $user['share']; ?>').remove();
                        $("#share_user").trigger("liszt:updated");
                });
@@ -63,7 +63,7 @@ echo html_select_options($allgroups, array());
        <script>
                $('#sharewithgroup_<?php echo $group['share']; ?> > img').click(function(){
                        $('#share_group option[value="<?php echo $group['share']; ?>"]').removeAttr('disabled');
-                       Calendar.UI.Share.unshare(<?php echo $id; ?>, 'calendar', '<?php echo $group['share']; ?>', 'group');
+                       Calendar.UI.Share.unshare(<?php echo $id; ?>, '<?php echo (array_key_exists('calid', $_)?'calendar':'event');?>, '<?php echo $group['share']; ?>', 'group'); ?>
                        $('#sharewithgroup_<?php echo $group['share']; ?>').remove();
                        $("#share_group").trigger("liszt:updated");
                });