diff --git a/apps/calendar/lib/sabre/object.php b/apps/calendar/lib/sabre/object.php index 25954e6ee5..0d1bfa397c 100644 --- a/apps/calendar/lib/sabre/object.php +++ b/apps/calendar/lib/sabre/object.php @@ -45,11 +45,11 @@ class OC_Connector_Sabre_CalDAV_CalendarObject extends Sabre_CalDAV_CalendarObje $uid = OC_Calendar_Calendar::extractUserID($this->getOwner()); if($uid != OCP\USER::getUser()) { - $sharedAddressbook = OCP\Share::getItemSharedWithBySource('calendar', $this->$calendarInfo['id']); - if ($sharedAddressbook && ($sharedAddressbook['permissions'] & OCP\Share::PERMISSION_READ)) { + $sharedCalendar = OCP\Share::getItemSharedWithBySource('calendar', $this->$calendarInfo['id']); + if ($sharedCalendar && ($sharedCalendar['permissions'] & OCP\Share::PERMISSION_READ)) { $readprincipal = 'principals/' . OCP\USER::getUser(); } - if ($sharedAddressbook && ($sharedAddressbook['permissions'] & OCP\Share::PERMISSION_UPDATE)) { + if ($sharedCalendar && ($sharedCalendar['permissions'] & OCP\Share::PERMISSION_UPDATE)) { $writeprincipal = 'principals/' . OCP\USER::getUser(); } } diff --git a/apps/files/js/fileactions.js b/apps/files/js/fileactions.js index 39e848cec8..89e7bdd7ad 100644 --- a/apps/files/js/fileactions.js +++ b/apps/files/js/fileactions.js @@ -77,6 +77,10 @@ FileActions={ parent.children('a.name').append(''); var defaultAction=FileActions.getDefault(FileActions.getCurrentMimeType(),FileActions.getCurrentType(), FileActions.getCurrentPermissions()); for(name in actions){ + // NOTE: Temporary fix to prevent rename action in root of Shared directory + if (name == 'Rename' && $('#dir').val() == '/Shared') { + continue; + } if((name=='Download' || actions[name]!=defaultAction) && name!='Delete'){ var img=FileActions.icons[name]; if(img.call){ diff --git a/apps/files/templates/part.list.php b/apps/files/templates/part.list.php index 6667b5488a..8faeae3939 100644 --- a/apps/files/templates/part.list.php +++ b/apps/files/templates/part.list.php @@ -9,7 +9,7 @@ $name = str_replace('%2F','/', $name); $directory = str_replace('+','%20',urlencode($file['directory'])); $directory = str_replace('%2F','/', $directory); ?> -