diff options
| author | Simon Rettberg | 2022-11-03 16:20:33 +0100 |
|---|---|---|
| committer | Simon Rettberg | 2022-11-03 16:20:33 +0100 |
| commit | c89d75f78d98da0dfe4c44b283b509dcdc1bcd3c (patch) | |
| tree | f6677d819c278a9367d92d04563d5520cbe3f078 /modules-available/minilinux/page.inc.php | |
| parent | [dozmod] Add field to configure maximum VM image size (diff) | |
| download | slx-admin-c89d75f78d98da0dfe4c44b283b509dcdc1bcd3c.tar.gz slx-admin-c89d75f78d98da0dfe4c44b283b509dcdc1bcd3c.tar.xz slx-admin-c89d75f78d98da0dfe4c44b283b509dcdc1bcd3c.zip | |
[minilinux] Add support for branch colors and changelogs
Diffstat (limited to 'modules-available/minilinux/page.inc.php')
| -rw-r--r-- | modules-available/minilinux/page.inc.php | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/modules-available/minilinux/page.inc.php b/modules-available/minilinux/page.inc.php index 411d1ae9..035a45d5 100644 --- a/modules-available/minilinux/page.inc.php +++ b/modules-available/minilinux/page.inc.php @@ -34,7 +34,7 @@ class Page_MiniLinux extends Page $show = Request::get('show', 'list', 'string'); if ($show === 'list') { // List branches and versions - $branches = Database::queryAll('SELECT sourceid, branchid, title, description FROM minilinux_branch ORDER BY title ASC'); + $branches = Database::queryAll('SELECT sourceid, branchid, title, color, description FROM minilinux_branch ORDER BY title ASC'); $versions = MiniLinux::queryAllVersionsByBranch(); $usage = MiniLinux::getBootMenuUsage(); $sourceList = []; @@ -44,7 +44,11 @@ class Page_MiniLinux extends Page if (!isset($sourceList[$branch['sourceid']])) { $sourceList[$branch['sourceid']] = ['sourceid' => $branch['sourceid'], 'list' => []]; } - $sourceList[$branch['sourceid']]['list'][] = ['title' => $branch['title'], 'bid' => $bid]; + $sourceList[$branch['sourceid']]['list'][] = [ + 'title' => $branch['title'], + 'color' => $branch['color'], + 'bid' => $bid + ]; $branch['bid'] = $bid; if (isset($versions[$branch['branchid']])) { $branch['versionlist'] = $this->renderVersionList($versions[$branch['branchid']], $usage); @@ -130,7 +134,8 @@ class Page_MiniLinux extends Page if ($versionid === false) { die('What!'); } - $ver = Database::queryFirst('SELECT versionid, taskid, data, installed FROM minilinux_version WHERE versionid = :versionid', + $ver = Database::queryFirst('SELECT versionid, description, taskid, data, installed + FROM minilinux_version WHERE versionid = :versionid', ['versionid' => $versionid]); if ($ver === false) { die('No such version'); @@ -184,6 +189,7 @@ class Page_MiniLinux extends Page if ($data['dltask'] !== false || $ver['installed']) { MiniLinux::checkStage4($data, $data['s4_errors']); } + $data['changelog'] = Util::markup($ver['description'] ?? ''); echo Render::parse('filelist', $data); } |