Skip to content

Make sure when we have no update and no download url we show the correct message #26076

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

Merged
wilsonge merged 2 commits into from
Sep 13, 2019
Merged

Make sure when we have no update and no download url we show the correct message #26076

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3352704
make sure when we have no update and no download url we show the corr…
zero-24 Aug 29, 2019
d9afc08
Merge branch 'staging' into noUpdatesAvailable
zero-24 Aug 30, 2019
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
7 changes: 5 additions & 2 deletions administrator/components/com_joomlaupdate/views/default/tmpl/default.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,11 +45,14 @@
<?php JFactory::getApplication()->enqueueMessage(JText::_('COM_JOOMLAUPDATE_VIEW_DEFAULT_INSTALL_SELF_UPDATE_FIRST'), 'error'); ?>
<?php echo $this->loadTemplate('updatemefirst'); ?>
<?php else : ?>
<?php if (!isset($this->updateInfo['object']->downloadurl->_data)) : ?>
<?php if (!isset($this->updateInfo['object']->downloadurl->_data) && !$this->updateInfo['hasUpdate']) : ?>
<?php // If we have no download URL and this is also not a new update at all ?>
<?php echo $this->loadTemplate('noupdate'); ?>
<?php elseif (!isset($this->updateInfo['object']->downloadurl->_data)) : ?>
<?php // If we have no download URL we can't reinstall or update ?>
<?php echo $this->loadTemplate('nodownload'); ?>
<?php elseif (!$this->updateInfo['hasUpdate']) : ?>
<?php // If we have no update we can reinstall the core ?>
<?php // If we have no update but we have a downloadurl we can reinstall the core ?>
<?php echo $this->loadTemplate('reinstall'); ?>
<?php else : ?>
<?php // Ok let's show the update template ?>
Expand Down
24 changes: 24 additions & 0 deletions administrator/components/com_joomlaupdate/views/default/tmpl/default_noupdate.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
<?php
/**
* @package Joomla.Administrator
* @subpackage com_joomlaupdate
*
* @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/

defined('_JEXEC') or die;

/** @var JoomlaupdateViewDefault $this */
?>
<fieldset>
<legend>
<?php echo JText::_('COM_JOOMLAUPDATE_VIEW_DEFAULT_NOUPDATES'); ?>
</legend>
<p>
<?php echo JText::sprintf($this->langKey, $this->updateSourceKey); ?>
</p>
<div class="alert alert-success">
<?php echo JText::sprintf('COM_JOOMLAUPDATE_VIEW_DEFAULT_NOUPDATESNOTICE', JVERSION); ?>
</div>
</fieldset>