Skip to content

[5.3] remove trashed status from new article page #45065

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

Closed
reem-atalah wants to merge 10 commits into from
Closed

[5.3] remove trashed status from new article page #45065

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
69c322d
44962: remove trashed status from new article page
reem-atalah Mar 4, 2025
5500b3a
44962: remove trashed status from new article page only
reem-atalah Mar 4, 2025
ecb2959
44962: remove trashed status from new article page
reem-atalah Mar 4, 2025
aff099b
centrelize the remove trash option method
reem-atalah Mar 5, 2025
113e563
centrelize the remove trash option method in FormField
reem-atalah Mar 5, 2025
3c326bb
generalize removeOption method
reem-atalah Mar 5, 2025
e9b313a
update for phpcs
reem-atalah Mar 5, 2025
bc03367
Merge branch '5.3-dev' into rmv-trash-from-new-article
richard67 Mar 14, 2025
91438ee
use instance listField instead of list
reem-atalah Mar 20, 2025
78f0ba6
Merge branch 'rmv-trash-from-new-article' of https://github.com/reem-…
reem-atalah Mar 20, 2025
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
9 changes: 9 additions & 0 deletions administrator/components/com_content/src/Model/ArticleModel.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -483,6 +483,15 @@ public function getForm($data = [], $loadData = true)

$record->id = $id;

// Remove trashed option from state field for new article form
if ($id == 0) {
$field = $form->getField('state');

if ($field !== false && $field->type === 'List') {

@laoneo laoneo Mar 19, 2025

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would do an instanceof check as the type field can be overwritten and then you can get a field with the type list but it is actually not a ListField class. Probably only on rare cases, but better safe than sorry.

@reem-atalah reem-atalah Mar 20, 2025

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the review. I'm considering it now.

@reem-atalah reem-atalah Mar 20, 2025

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@laoneo I changed it, I hope I have your feedback.

$field->removeOption(-2);
}
}

// For new articles we load the potential state + associations
if ($id == 0 && $formField = $form->getField('catid')) {
$assignedCatids = $data['catid'] ?? $form->getValue('catid');
Expand Down
21 changes: 21 additions & 0 deletions libraries/src/Form/Field/ListField.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,6 +234,27 @@ public function addOption($text, $attributes = [])
return $this;
}

/**
* Method to remove an option from list field.
*
* @param string $value The value of the option to remove
*
* @return static For chaining.
*
* @since __DEPLOY_VERSION__
*/
public function removeOption(string $value): static
{
foreach ($this->element->option as $option) {
if ((string) $option['value'] === $value) {
$dom = dom_import_simplexml($option);
$dom->parentNode->removeChild($dom);
}
}

return $this;
}

/**
* Method to get certain otherwise inaccessible properties from the form field object.
*
Expand Down