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

[4.2] [UX] Reset hidden postinstallation messages #37423

Closed
wants to merge 12 commits into from
Closed

[4.2] [UX] Reset hidden postinstallation messages #37423

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
6ecb217
fix issue #37399
Mar 30, 2022
a1c7ce2
Merge branch '4.2-dev' into i37399
Mar 30, 2022
e6663e0
show reset button only when messages are hidden
Mar 30, 2022
b3bf924
Merge branch 'i37399' of https://github.com/MagnusSinger/joomla-cms i…
Mar 30, 2022
dc71951
Merge branch '4.2-dev' into i37399
Apr 1, 2022
b6c85fc
Merge branch '4.2-dev' into i37399
Apr 11, 2022
7d69961
update comment from Quy's suggestion
Apr 11, 2022
0ad282c
update reset button styling
Apr 12, 2022
0d1d863
Merge branch '4.2-dev' into i37399
Apr 12, 2022
03c88cb
update button name
Apr 12, 2022
247a0d2
remove icon from button
Apr 12, 2022
18993c3
Merge branch '4.2-dev' into i37399
Jun 14, 2022
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
27 changes: 22 additions & 5 deletions administrator/components/com_postinstall/src/Model/MessagesModel.php
View file
Open in desktop
Expand Up @@ -188,6 +188,23 @@ public function getItems()
return $result;
}

/**
* Get hidden messages
*
* @return array the hidden messages
*
* @since __DEPLOY_VERSION__
*/
public function getHidden(): array
{
$initial = (int) $this->getState('published', 1);
$this->setState('published', 0);
$result = $this->getItems();
$this->setState('published', $initial);

return $result;
}

/**
* Returns a count of all enabled messages from the #__postinstall_messages table
*
Expand Down Expand Up @@ -270,7 +287,7 @@ public function getExtensionName($eid)

$extension = $db->loadObject();

if (!is_object($extension))
if (!\is_object($extension))
{
return '';
}
Expand Down Expand Up @@ -378,7 +395,7 @@ protected function onProcessList(&$resultArray)
{
require_once $file;

$result = call_user_func($item->condition_method);
$result = \call_user_func($item->condition_method);

if ($result === false)
{
Expand All @@ -392,7 +409,7 @@ protected function onProcessList(&$resultArray)
{
$hash = $item->language_client_id . '-' . $item->language_extension;

if (!in_array($hash, $language_extensions))
if (!\in_array($hash, $language_extensions))
{
$language_extensions[] = $hash;
Factory::getApplication()->getLanguage()->load($item->language_extension, $item->language_client_id == 0 ? JPATH_SITE : JPATH_ADMINISTRATOR);
Expand Down Expand Up @@ -510,7 +527,7 @@ public function getComponentOptions()
public function addPostInstallationMessage(array $options)
{
// Make sure there are options set
if (!is_array($options))
if (!\is_array($options))
{
throw new \Exception('Post-installation message definitions must be of type array', 500);
}
Expand Down Expand Up @@ -565,7 +582,7 @@ public function addPostInstallationMessage(array $options)
}

// Make sure there's a valid type
if (!in_array($options['type'], array('message', 'link', 'action')))
if (!\in_array($options['type'], array('message', 'link', 'action')))
{
throw new \Exception('Post-installation message definitions need to declare a type of message, link or action', 500);
}
Expand Down
6 changes: 6 additions & 0 deletions administrator/components/com_postinstall/src/View/Messages/HtmlView.php
View file
Open in desktop
Expand Up @@ -40,6 +40,7 @@ public function display($tpl = null)
$model = $this->getModel();

$this->items = $model->getItems();
$this->hidden = $model->getHidden();

if (!\count($this->items))
{
Expand Down Expand Up @@ -78,6 +79,11 @@ private function toolbar()
if (!empty($this->items))
{
$toolbar->unpublish('message.hideAll', 'COM_POSTINSTALL_HIDE_ALL_MESSAGES');

if (!empty($this->hidden))
{
$toolbar->standardButton('refresh', 'COM_POSTINSTALL_EMPTYSTATE_BUTTON_ADD', 'message.reset');
}
}

// Options button.
Expand Down