Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove column from articles URL #6594

Merged
merged 3 commits into from
Dec 5, 2023
Merged

Remove column from articles URL #6594

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6713bfe
Remove column from articles URL
aschempp Dec 4, 2023
d4f7559
Also adjust the `Controller::redirectToFrontendPage()` method
leofeyer Dec 5, 2023
89ec742
CS
leofeyer Dec 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 1 addition & 9 deletions core-bundle/contao/elements/ContentTeaser.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,16 +66,8 @@ public function generate()
*/
protected function compile()
{
$link = '/articles/';
$objArticle = $this->objArticle;

if ($objArticle->inColumn != 'main')
{
$link .= $objArticle->inColumn . ':';
}

$link .= $objArticle->alias ?: $objArticle->id;
$this->Template->href = $this->objParent->getFrontendUrl($link);
$this->Template->href = $this->objParent->getFrontendUrl('/articles/' . ($objArticle->alias ?: $objArticle->id));

$this->Template->text = $objArticle->teaser;
$this->Template->headline = $objArticle->title;
Expand Down
25 changes: 13 additions & 12 deletions core-bundle/contao/library/Contao/Controller.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -304,24 +304,25 @@ public static function getFrontendModule($intId, $strColumn='main')
// Show a particular article only
if ($objPage->type == 'regular' && Input::get('articles'))
{
list($strSection, $strArticle) = explode(':', Input::get('articles')) + array(null, null);
$strArticle = Input::get('articles');

if ($strArticle === null)
if (str_contains($strArticle, ':'))
{
$strArticle = $strSection;
$strSection = 'main';
trigger_deprecation('contao/core-bundle', '5.3', 'Passing the column of an article in the URL is deprecated. Only provide the article alias instead.');

list(, $strArticle) = explode(':', Input::get('articles'));
}

if ($strSection == $strColumn)
{
$objArticle = ArticleModel::findPublishedByIdOrAliasAndPid($strArticle, $objPage->id);
$objArticle = ArticleModel::findPublishedByIdOrAliasAndPid($strArticle, $objPage->id);

// Send a 404 header if there is no published article
if (null === $objArticle)
{
throw new PageNotFoundException('Page not found: ' . Environment::get('uri'));
}
// Send a 404 header if there is no published article
if (null === $objArticle)
{
throw new PageNotFoundException('Page not found: ' . Environment::get('uri'));
}

if ($objArticle->inColumn == $strColumn)
{
// Send a 403 header if the article cannot be accessed
if (!static::isVisibleElement($objArticle))
{
Expand Down
9 changes: 2 additions & 7 deletions core-bundle/contao/modules/ModuleArticle.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,12 +138,9 @@ protected function compile()
$this->cssID = $arrCss;
}

$article = $this->alias ?: $this->id;
$href = '/articles/' . (($this->inColumn != 'main') ? $this->inColumn . ':' : '') . $article;

$this->Template->teaserOnly = true;
$this->Template->headline = $this->headline;
$this->Template->href = $objPage->getFrontendUrl($href);
$this->Template->href = $objPage->getFrontendUrl('/articles/' . ($this->alias ?: $this->id));
$this->Template->teaser = $this->teaser ?? '';
$this->Template->readMore = StringUtil::specialchars(sprintf($GLOBALS['TL_LANG']['MSC']['readMore'], $this->headline), true);
$this->Template->more = $GLOBALS['TL_LANG']['MSC']['more'];
Expand All @@ -152,9 +149,7 @@ protected function compile()
}

// Get section and article alias
$chunks = explode(':', Input::get('articles') ?? '');
$strSection = $chunks[0] ?? null;
$strArticle = $chunks[1] ?? $strSection;
$strArticle = Input::get('articles');

// Overwrite the page metadata (see #2853, #4955 and #87)
if (!$this->blnNoMarkup && $strArticle && ($strArticle == $this->id || $strArticle == $this->alias) && $this->title)
Expand Down
17 changes: 2 additions & 15 deletions core-bundle/contao/modules/ModuleBreadcrumb.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,28 +163,15 @@ protected function compile()
'data' => $pages[0]->row(),
);

list($strSection, $strArticle) = explode(':', Input::get('articles')) + array(null, null);

if ($strArticle === null)
{
$strArticle = $strSection;
}

$objArticle = ArticleModel::findByIdOrAlias($strArticle);
$strAlias = $objArticle->alias ?: $objArticle->id;

if ($objArticle->inColumn != 'main')
{
$strAlias = $objArticle->inColumn . ':' . $strAlias;
}
$objArticle = ArticleModel::findByIdOrAlias(Input::get('articles'));

if ($objArticle !== null)
{
$items[] = array
(
'isRoot' => false,
'isActive' => true,
'href' => $this->getPageFrontendUrl($pages[0], '/articles/' . $strAlias),
'href' => $this->getPageFrontendUrl($pages[0], '/articles/' . ($objArticle->alias ?: $objArticle->id)),
'title' => StringUtil::specialchars($objArticle->title, true),
'link' => $objArticle->title,
'data' => $objArticle->row(),
Expand Down
8 changes: 1 addition & 7 deletions core-bundle/src/Controller/ContentElement/TeaserController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,13 +35,7 @@ protected function getResponse(FragmentTemplate $template, ContentModel $model,

[$article, $page] = $articleAndPage;

$href = $page->getFrontendUrl(
sprintf(
'/articles/%s%s',
'main' !== $article->inColumn ? "$article->inColumn:" : '',
$article->alias ?: $article->id,
),
);
$href = $page->getFrontendUrl('/articles/'.($article->alias ?: $article->id));

$template->set('article', $article);
$template->set('page', $page);
Expand Down
2 changes: 1 addition & 1 deletion core-bundle/src/EventListener/PreviewUrlConvertListener.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ private function getParams(Request $request, int $pageId): string|null
}

// Add the /article/ fragment (see contao/core-bundle#673)
return sprintf('/articles/%s%s', 'main' !== $article->inColumn ? $article->inColumn.':' : '', $article->alias);
return '/articles/'.($article->alias ?: $article->id);
}

private function getFragmentUrl(Request $request, PageModel $pageModel): string
Expand Down