Merge branch 'show_changelog' of https://github.com/NunoLopes96/gsoc1…

…7_expand_extension_manager into show_changelog
joomla · May 23, 2017 · eaa19cd · eaa19cd
2 parents 813f69f + 9a05cee
commit eaa19cd
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 6 deletions.
diff --git a/administrator/components/com_admin/sql/updates/mysql/4.0.0-2017-05-17.sql b/administrator/components/com_admin/sql/updates/mysql/4.0.0-2017-05-17.sql
@@ -0,0 +1 @@
+ALTER TABLE `#__updates` ADD COLUMN `changelogurl` text AFTER `infourl`;
diff --git a/administrator/components/com_admin/sql/updates/postgresql/4.0.0-2017-05-17.sql b/administrator/components/com_admin/sql/updates/postgresql/4.0.0-2017-05-17.sql
@@ -0,0 +1 @@
+ALTER TABLE "#__updates" ADD COLUMN "changelogurl" text AFTER `infourl`;
diff --git a/administrator/components/com_installer/views/update/tmpl/default.php b/administrator/components/com_installer/views/update/tmpl/default.php
@@ -78,11 +78,9 @@
 							</tfoot>
 							<tbody>
 							<?php foreach ($this->items as $i => $item) : ?>
-								<?php
-								$client          = $item->client_id ? JText::_('JADMINISTRATOR') : JText::_('JSITE');
-								$manifest        = json_decode($item->manifest_cache);
-								$current_version = isset($manifest->version) ? $manifest->version : JText::_('JLIB_UNKNOWN');
-								?>
+								<?php $client          = $item->client_id ? JText::_('JADMINISTRATOR') : JText::_('JSITE'); ?>
+								<?php $manifest        = json_decode($item->manifest_cache); ?>
+								<?php $current_version = isset($manifest->version) ? $manifest->version : JText::_('JLIB_UNKNOWN'); ?>
 								<tr class="row<?php echo $i % 2; ?>">
 									<td>
 										<?php echo JHtml::_('grid.id', $i, $item->update_id); ?>
@@ -105,6 +103,14 @@
 									</td>
 									<td>
 										<span class="badge badge-success"><?php echo $item->version; ?></span>
+										<?php $modal_params = array(); ?>
+										<?php $modal_params['title'] = $item->version . " - " . $item->name; ?>
+										<?php $modal_params['height'] = '500px'; ?>
+										<?php $body = '<iframe height="500px" src="' . $item->changelogurl . '"></iframe>'; ?>
+
+										<a href="#myModal" class="btn" data-toggle="modal"> <?php echo $item->version; ?></a>
+
+										<?php echo JHTML::_('bootstrap.renderModal', 'myModal', $modal_params, $body); ?>
 									</td>
 									<td class="hidden-sm-down text-center">
 										<?php echo $item->folder_translated; ?>

diff --git a/installation/sql/mysql/joomla.sql b/installation/sql/mysql/joomla.sql
@@ -1877,6 +1877,7 @@ CREATE TABLE IF NOT EXISTS `#__updates` (
   `data` text NOT NULL,
   `detailsurl` text NOT NULL,
   `infourl` text NOT NULL,
+  `changelogurl` text,
   `extra_query` varchar(1000) DEFAULT '',
   PRIMARY KEY (`update_id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE=utf8mb4_unicode_ci COMMENT='Available Updates';

diff --git a/installation/sql/postgresql/joomla.sql b/installation/sql/postgresql/joomla.sql
@@ -1854,6 +1854,7 @@ CREATE TABLE IF NOT EXISTS "#__updates" (
   "data" text NOT NULL,
   "detailsurl" text NOT NULL,
   "infourl" text NOT NULL,
+  "changelogurl" text,
   "extra_query" varchar(1000) DEFAULT '',
   PRIMARY KEY ("update_id")
 );

diff --git a/libraries/joomla/updater/updateadapter.php b/libraries/joomla/updater/updateadapter.php
@@ -48,7 +48,7 @@ abstract class JUpdateAdapter extends JAdapterInstance
 	 * @var    array
 	 * @since  12.1
 	 */
-	protected $updatecols = array('NAME', 'ELEMENT', 'TYPE', 'FOLDER', 'CLIENT', 'VERSION', 'DESCRIPTION', 'INFOURL', 'EXTRA_QUERY');
+	protected $updatecols = array('NAME', 'ELEMENT', 'TYPE', 'FOLDER', 'CLIENT', 'VERSION', 'DESCRIPTION', 'INFOURL', 'CHANGELOGURL', 'EXTRA_QUERY');
 
 	/**
 	 * Should we try appending a .xml extension to the update site's URL?