Allow forget shared note..

This commit is contained in:
Matias De lellis
2020-06-16 23:38:17 -03:00
parent dd534e1f1b
commit 76b8b0dd99
3 changed files with 117 additions and 12 deletions

View File

@@ -11,6 +11,12 @@ return ['resources' =>
'url' => '/',
'verb' => 'GET'
],
// Share
[
'name' => 'share#destroy',
'url' => '/share/{noteId}',
'verb' => 'DELETE'
],
// User Settings
[
'name' => 'settings#setUserValue',

View File

@@ -143,6 +143,22 @@ Notes.prototype = {
});
return deferred.promise();
},
// Delete shared note.
forgetShare: function (note) {
var self = this;
var deferred = $.Deferred();
$.ajax({
url: OC.generateUrl('/apps/quicknotes/share') + '/' + note.id,
method: 'DELETE'
}).done(function () {
var index = self._notes.findIndex((aNote) => aNote.id === note.id);
self._notes.splice(index, 1);
deferred.resolve();
}).fail(function () {
deferred.reject();
});
return deferred.promise();
},
// Get the users to share in the notes
_loadUsersSharing: function () {
var self = this;
@@ -328,18 +344,33 @@ View.prototype = {
t('quicknotes', 'Delete note'),
function(result) {
if (result) {
self._notes.remove(note).done(function () {
if (self._notes.length() > 0) {
$(".notes-grid").isotope('remove', gridnote.parent())
.isotope('layout');
self.showAll();
self.renderNavigation();
} else {
self.render();
}
}).fail(function () {
alert('Could not delete note, not found');
});
if (!note.is_shared) {
self._notes.remove(note).done(function () {
if (self._notes.length() > 0) {
$(".notes-grid").isotope('remove', gridnote.parent())
.isotope('layout');
self.showAll();
self.renderNavigation();
} else {
self.render();
}
}).fail(function () {
alert('Could not delete note, not found');
});
} else {
self._notes.forgetShare(note).done(function () {
if (self._notes.length() > 0) {
$(".notes-grid").isotope('remove', gridnote.parent())
.isotope('layout');
self.showAll();
self.renderNavigation();
} else {
self.render();
}
}).fail(function () {
alert('Could not delete note, not found');
});
}
}
},
true

View File

@@ -0,0 +1,68 @@
<?php
/*
* @copyright 2020 Matias De lellis <mati86dl@gmail.com>
*
* @author 2020 Matias De lellis <mati86dl@gmail.com>
*
* @license GNU AGPL version 3 or any later version
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
namespace OCA\QuickNotes\Controller;
use OCP\AppFramework\Http;
use OCP\AppFramework\Http\JSONResponse;
use OCP\AppFramework\Controller;
use OCP\IRequest;
use OCA\QuickNotes\Db\NoteShare;
use OCA\QuickNotes\Db\NoteShareMapper;
class ShareController extends Controller {
private $noteShareMapper;
private $userId;
public function __construct($AppName,
IRequest $request,
NoteShareMapper $noteShareMapper,
$userId)
{
parent::__construct($AppName, $request);
$this->noteShareMapper = $noteShareMapper;
$this->userId = $userId;
}
/**
* @NoAdminRequired
*
* @param int $noteId
*/
public function destroy(int $noteId): JSONResponse {
try {
$noteShare = $this->noteShareMapper->findByNoteAndUser($noteId, $this->userId);
} catch (DoesNotExistException $e) {
return new JSONResponse([], Http::STATUS_NOT_FOUND);
}
$this->noteShareMapper->delete($noteShare);
return new JSONResponse([]);
}
}