mirror/php-typemill
1
0
Fork 0
mirror of https://github.com/typemill/typemill.git synced 2025-07-31 03:10:19 +02:00
Code Issues Releases Wiki Activity

2.8.0 Fix dispatcher url in sortArticles and refresh after sort active page

Browse Source
This commit is contained in:
trendschau
2024-08-13 15:00:36 +02:00
parent eba3bb996a
commit e672ff7011
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
system/typemill/Controllers/ControllerApiAuthorArticle.php
View File

@@ -889,7 +889,8 @@ class ControllerApiAuthorArticle extends Controller
# get navigation
$urlinfo = $this->c->get('urlinfo');
$url = false; # to pitch new url for redirect in frontend
$dispatchurl = false; # without editor
$redirecturl = false; # with editor
$langattr = $this->settings['langattr'];
$navigation = new Navigation();
$item = $navigation->getItemForUrl($params['url'], $urlinfo, $langattr);
@@ -970,13 +971,13 @@ class ControllerApiAuthorArticle extends Controller
else
{
# we always need to know the new url to get and dispatch the new item later
$newurl = $urlinfo['baseurl'] . '/tm/content/' . $this->settings['editor'] . $newFolder->urlRelWoF . '/' . $item->slug;
$dispatchurl = $newFolder->urlRelWoF . '/' . $item->slug;
# an active file has been moved to another folder, so send new url with response
if($params['active'] == 'active')
{
# we only want to send the new url to redirect in frontend if user is on page.
$url = $newurl;
$redirecturl = $urlinfo['baseurl'] . '/tm/content/' . $this->settings['editor'] . $newFolder->urlRelWoF . '/' . $item->slug;
}
}
@@ -1025,8 +1026,8 @@ class ControllerApiAuthorArticle extends Controller
}
# get the new item to dispatch it
$newurl = isset($newurl) ? $newurl : $params['url'];
$newItem = $navigation->getItemForUrl($newurl, $urlinfo, $langattr);
$newurl = $dispatchurl ? $dispatchurl : $params['url'];
$newitem = $navigation->getItemForUrl($newurl, $urlinfo, $langattr);
$data = [
'olditem' => $item,
@@ -1038,7 +1039,7 @@ class ControllerApiAuthorArticle extends Controller
$response->getBody()->write(json_encode([
'navigation' => $draftNavigation,
'message' => '',
'url' => $url
'url' => $redirecturl
]));
return $response->withHeader('Content-Type', 'application/json');

2
system/typemill/author/js/vue-contentnavi.js
View File

@@ -365,7 +365,7 @@ navigation.component('navilevel',{
'parent_id_to': evt.to.parentNode.id,
'index_old': evt.oldIndex,
'index_new': evt.newIndex,
'active': evt.item.dataset.active,
'active': evt.item.dataset.active === 'true' ? 'active' : '',
'url': evt.item.dataset.url,
})
.then(function (response)