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

[5.2] Content Category Save to Menu #43840

Merged
merged 7 commits into from
Jul 29, 2024
Merged

[5.2] Content Category Save to Menu #43840

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
ffd2240
[5.2] Content Category Save to Menu
brianteeman Jul 24, 2024
1da2327
native invocation
brianteeman Jul 24, 2024
b38b05d
Merge branch '5.2-dev' into save_categoery_menu
brianteeman Jul 24, 2024
0e29e91
single quote
brianteeman Jul 24, 2024
224214d
Merge branch '5.2-dev' into save_categoery_menu
brianteeman Jul 24, 2024
6368370
Merge branch '5.2-dev' into save_categoery_menu
Quy Jul 27, 2024
dcd22d4
Merge branch '5.2-dev' into save_categoery_menu
Hackwar Jul 29, 2024
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
33 changes: 31 additions & 2 deletions administrator/components/com_categories/src/Controller/CategoryController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,9 @@ public function __construct($config = [], MVCFactoryInterface $factory = null, C
if (empty($this->extension)) {
$this->extension = $this->input->get('extension', 'com_content');
}

$this->registerTask('save2menulist', 'save');
$this->registerTask('save2menublog', 'save');
}

/**
Expand Down Expand Up @@ -254,8 +257,34 @@ protected function postSaveHook(BaseDatabaseModel $model, $validData = [])
$item->metadata = (string) $registry;
}

// When editing in modal then redirect to modalreturn layout
if ($this->input->get('layout') === 'modal' && $this->task === 'save') {
if (\in_array($this->getTask(), ['save2menulist', 'save2menublog'])) {
$editState = [];

$type = 'component';
$id = $model->getState('category.id');
$link = 'index.php?option=com_content&view=category';

if ($this->getTask() === 'save2menublog') {
$link .= '&layout=blog'; // Append the layout parameter for the blog layout
}

$editState = [
'id' => $id,
'link' => $link,
'title' => $model->getItem($id)->title,
'type' => $type,
'request' => ['id' => $id],
];

$this->app->setUserState('com_menus.edit.item', [
'data' => $editState,
'type' => $type,
'link' => $link,
]);

$this->setRedirect(Route::_('index.php?option=com_menus&view=item&client_id=0&menutype=mainmenu&layout=edit', false));
} elseif ($this->input->get('layout') === 'modal' && $this->task === 'save') {
// When editing in modal then redirect to modalreturn layout
$id = $item->id;
$return = 'index.php?option=' . $this->option . '&view=' . $this->view_item . $this->getRedirectToItemAppend($id)
. '&layout=modalreturn&from-task=save';
Expand Down
15 changes: 13 additions & 2 deletions administrator/components/com_categories/src/View/Category/HtmlView.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,7 @@ public function display($tpl = null)
protected function addToolbar()
{
$extension = Factory::getApplication()->getInput()->get('extension');

$user = $this->getCurrentUser();
$userId = $user->id;
$toolbar = Toolbar::getInstance();
Expand Down Expand Up @@ -203,9 +204,14 @@ protected function addToolbar()
$saveGroup = $toolbar->dropdownButton('save-group');

$saveGroup->configure(
function (Toolbar $childBar) {
function (Toolbar $childBar) use ($canDo, $component) {
$childBar->save('category.save');
$childBar->save2new('category.save2new');

if ($canDo->get('core.create', 'com_menus.menu') && $component === 'com_content') {
$childBar->save('category.save2menulist', 'JTOOLBAR_SAVE_TO_MENU_AS_LIST');
$childBar->save('category.save2menublog', 'JTOOLBAR_SAVE_TO_MENU_AS_BLOG');
}
}
);

Expand All @@ -223,7 +229,7 @@ function (Toolbar $childBar) {
$saveGroup = $toolbar->dropdownButton('save-group');

$saveGroup->configure(
function (Toolbar $childBar) use ($checkedOut, $canDo, $itemEditable) {
function (Toolbar $childBar) use ($checkedOut, $canDo, $itemEditable, $component) {
// Can't save the record if it's checked out and editable
if (!$checkedOut && $itemEditable) {
$childBar->save('category.save');
Expand All @@ -233,6 +239,11 @@ function (Toolbar $childBar) use ($checkedOut, $canDo, $itemEditable) {
}
}

if ($canDo->get('core.create', 'com_menus.menu') && $component === 'com_content') {
$childBar->save('category.save2menulist', 'JTOOLBAR_SAVE_TO_MENU_AS_LIST');
$childBar->save('category.save2menublog', 'JTOOLBAR_SAVE_TO_MENU_AS_BLOG');
}

// If an existing item, can save to a copy.
if ($canDo->get('core.create')) {
$childBar->save2copy('category.save2copy');
Expand Down
2 changes: 2 additions & 0 deletions administrator/language/en-GB/joomla.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -806,6 +806,8 @@ JTOOLBAR_SAVE="Save & Close"
JTOOLBAR_SAVE_AND_NEW="Save & New"
JTOOLBAR_SAVE_AS_COPY="Save as Copy"
JTOOLBAR_SAVE_TO_MENU="Save to Menu"
JTOOLBAR_SAVE_TO_MENU_AS_BLOG="Save to Menu as Blog"
JTOOLBAR_SAVE_TO_MENU_AS_LIST="Save to Menu as List"
JTOOLBAR_TRASH="Trash"
JTOOLBAR_UNARCHIVE="Unarchive"
JTOOLBAR_UNINSTALL="Uninstall"
Expand Down