Knah-Tsaeb/MyShaarli
Knah-Tsaeb/MyShaarli
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #1215 from ArthurHoaro/hotfix/tag-deletion

Browse source 
Fix a JS bug preventing AJAX tag deletion to work
This commit is contained in:
ArthurHoaro 2018-09-20 23:34:44 +02:00 committed by GitHub
commit a4fbe88b6d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
assets/default/js/base.js
View file

@ -548,7 +548,7 @@ function init(description) {
event.preventDefault(); event.preventDefault();
const block = findParent(event.target, 'div', { class: 'tag-list-item' }); const block = findParent(event.target, 'div', { class: 'tag-list-item' });
const tag = block.getAttribute('data-tag'); const tag = block.getAttribute('data-tag');
const refreshedToken = document.getElementById('token'); const refreshedToken = document.getElementById('token').value;
if (confirm(`Are you sure you want to delete the tag "${tag}"?`)) { if (confirm(`Are you sure you want to delete the tag "${tag}"?`)) {
const xhr = new XMLHttpRequest(); const xhr = new XMLHttpRequest();

3
index.php
View file

@ -1084,7 +1084,8 @@ function renderPage($conf, $pluginManager, $LINKSDB, $history, $sessionManager,
die(t('Wrong token.')); die(t('Wrong token.'));
} }
$alteredLinks = $LINKSDB->renameTag(escape($_POST['fromtag']), escape($_POST['totag'])); $toTag = isset($_POST['totag']) ? escape($_POST['totag']) : null;
$alteredLinks = $LINKSDB->renameTag(escape($_POST['fromtag']), $toTag);
$LINKSDB->save($conf->get('resource.page_cache')); $LINKSDB->save($conf->get('resource.page_cache'));
foreach ($alteredLinks as $link) { foreach ($alteredLinks as $link) {
$history->updateLink($link); $history->updateLink($link);