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

Cleaned up discussion idWithSlug handling #2046

Closed
wants to merge 5 commits into from
Closed

Cleaned up discussion idWithSlug handling #2046

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
48d0db8
Cleaned up discussion idWithSlug handling
askvortsov1 Mar 3, 2020
b47cf79
Put slug attribute back into frontend model
askvortsov1 Mar 3, 2020
1e5df10
Logic fix
askvortsov1 Mar 3, 2020
8db25a1
Prettify updates
askvortsov1 Apr 21, 2020
e5d19a8
Undid accidential formating changes
askvortsov1 May 31, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions js/src/common/models/Discussion.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ export default class Discussion extends Model {}
Object.assign(Discussion.prototype, {
title: Model.attribute('title'),
slug: Model.attribute('slug'),
idWithSlug: Model.attribute('idWithSlug'),

createdAt: Model.attribute('createdAt', Model.transformDate),
user: Model.hasOne('user'),
Expand Down
3 changes: 1 addition & 2 deletions js/src/forum/routes.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,8 @@ export default function (app) {
* @return {String}
*/
app.route.discussion = (discussion, near) => {
const slug = discussion.slug();
return app.route(near && near !== 1 ? 'discussion.near' : 'discussion', {
id: discussion.id() + (slug.trim() ? '-' + slug : ''),
id: discussion.idWithSlug(),
near: near && near !== 1 ? near : undefined,
});
};
Expand Down
1 change: 1 addition & 0 deletions src/Api/Serializer/BasicDiscussionSerializer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ protected function getDefaultAttributes($discussion)
return [
'title' => $discussion->title,
'slug' => $discussion->slug,
'idWithSlug' => $discussion->id.(trim($discussion->slug) ? '-'.$discussion->slug : '')
];
}

Expand Down
4 changes: 1 addition & 3 deletions src/Forum/Content/Discussion.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,9 +74,7 @@ public function __invoke(Document $document, Request $request)
unset($newQueryParams['id']);
$queryString = http_build_query($newQueryParams);

$idWithSlug = $apiDocument->data->id.(trim($apiDocument->data->attributes->slug) ? '-'.$apiDocument->data->attributes->slug : '');

return $this->url->to('forum')->route('discussion', ['id' => $idWithSlug]).
return $this->url->to('forum')->route('discussion', ['id' => $apiDocument->data->attributes->idWithSlug]).
($queryString ? '?'.$queryString : '');
};

Expand Down
18 changes: 8 additions & 10 deletions views/frontend/content/index.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,21 +5,19 @@

<ul>
@foreach ($apiDocument->data as $discussion)
<li>
<a href="{{ $url->to('forum')->route('discussion', [
'id' => $discussion->id . (trim($discussion->attributes->slug) ? '-' . $discussion->attributes->slug : '')
]) }}">
{{ $discussion->attributes->title }}
</a>
</li>
<li>
<a href="{{ $url->to('forum')->route('discussion', ['id' => $discussion->attributes->idWithSlug]) }}">
{{ $discussion->attributes->title }}
</a>
</li>
@endforeach
</ul>

@if (isset($apiDocument->links->prev))
<a href="{{ $url->to('forum')->route('index') }}?page={{ $page - 1 }}">&laquo; {{ $translator->trans('core.views.index.previous_page_button') }}</a>
<a href="{{ $url->to('forum')->route('index') }}?page={{ $page - 1 }}">&laquo; {{ $translator->trans('core.views.index.previous_page_button') }}</a>
@endif

@if (isset($apiDocument->links->next))
<a href="{{ $url->to('forum')->route('index') }}?page={{ $page + 1 }}">{{ $translator->trans('core.views.index.next_page_button') }} &raquo;</a>
<a href="{{ $url->to('forum')->route('index') }}?page={{ $page + 1 }}">{{ $translator->trans('core.views.index.next_page_button') }} &raquo;</a>
@endif
</div>
</div>
askvortsov1 marked this conversation as resolved.
Show resolved Hide resolved