GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

[CONTROLLER][CollectionController] Refactored methods names and form

Browse Source 
titles
[PLUGINS][AttachmentCollections] Renamed respective Controller to
differentiate it between The Controller and itself, renamed templates
and removed unnecessary HTML from templates
This commit is contained in:
Eliseu Amaro
2022-01-02 18:40:09 +00:00
committed by Diogo Peralta Cordeiro
parent 7ad39fdc83
commit 28424402ec
8 changed files with 74 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
plugins/AttachmentCollections/AttachmentCollections.php
View File

@@ -33,7 +33,6 @@ namespace Plugin\AttachmentCollections;
use App\Core\DB\DB;
use App\Core\Event;
use function App\Core\I18n\_m;
use App\Core\Modules\Collection;
use App\Core\Router\RouteLoader;
use App\Core\Router\Router;
@@ -41,10 +40,11 @@ use App\Entity\Actor;
use App\Entity\Feed;
use App\Entity\LocalUser;
use App\Util\Nickname;
use Plugin\AttachmentCollections\Controller as C;
use Plugin\AttachmentCollections\Controller\AttachmentCollections as AttachmentCollectionsController;
use Plugin\AttachmentCollections\Entity\AttachmentCollection;
use Plugin\AttachmentCollections\Entity\AttachmentCollectionEntry;
use Symfony\Component\HttpFoundation\Request;
use function App\Core\I18n\_m;
class AttachmentCollections extends Collection
{
@@ -128,23 +128,23 @@ class AttachmentCollections extends Collection
$r->connect(
id: 'collections_view_by_actor_id',
uri_path: '/actor/{id<\d+>}/collections',
target: [C\Controller::class, 'collectionsViewByActorId'],
target: [AttachmentCollectionsController::class, 'collectionsListViewByActorId'],
);
$r->connect(
id: 'collections_view_by_nickname',
uri_path: '/@{nickname<' . Nickname::DISPLAY_FMT . '>}/collections',
target: [C\Controller::class, 'collectionsByActorNickname'],
target: [AttachmentCollectionsController::class, 'collectionsListViewByActorNickname'],
);
// View notes from a collection by actor id and nickname
$r->connect(
id: 'collection_notes_view_by_actor_id',
uri_path: '/actor/{id<\d+>}/collections/{cid<\d+>}',
target: [C\Controller::class, 'collectionNotesViewByActorId'],
target: [AttachmentCollectionsController::class, 'collectionsEntryViewNotesByActorId'],
);
$r->connect(
id: 'collection_notes_view_by_nickname',
uri_path: '/@{nickname<' . Nickname::DISPLAY_FMT . '>}/collections/{cid<\d+>}',
target: [C\Controller::class, 'collectionNotesByNickname'],
target: [AttachmentCollectionsController::class, 'collectionsEntryViewNotesByNickname'],
);
return Event::next;
}

4
plugins/AttachmentCollections/Controller/Controller.php → plugins/AttachmentCollections/Controller/AttachmentCollections.php
View File

@@ -28,7 +28,7 @@ use App\Core\DB\DB;
use App\Core\Router\Router;
use Plugin\AttachmentCollections\Entity\AttachmentCollection;
class Controller extends CollectionController
class AttachmentCollections extends CollectionController
{
public function createCollection(int $owner_id, string $name)
{
@@ -64,7 +64,7 @@ class Controller extends CollectionController
['cid' => $collection_id],
);
return [
'_template' => 'AttachmentCollections/collection.html.twig',
'_template' => 'AttachmentCollections/collection_entry_view.html.twig',
'attachments' => array_values($attachs),
'bare_notes' => array_values($notes),
];

2
plugins/AttachmentCollections/templates/AttachmentCollections/collection.html.twig → plugins/AttachmentCollections/templates/AttachmentCollections/collection_entry_view.html.twig
View File

@@ -1,4 +1,4 @@
{% extends 'collections/collection.html.twig' %}
{% extends 'collections/collection_entry_view.html.twig' %}
{% block collection_items %}
{% for key, attachment in attachments %}