Squidly271/community.applications
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

misc fixes

Browse Source
This commit is contained in:
Squidly271 2021-10-17 13:03:59 -04:00
parent fc4f616e7f
commit 2204e0c23c
6 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
archive/community.applications-2021.10.17a-x86_64-1.txz Normal file
View File

Binary file not shown.

13
plugins/community.applications.plg
View File

@ -2,8 +2,8 @@
<!DOCTYPE PLUGIN [
<!ENTITY name "community.applications">
<!ENTITY author "Andrew Zawadzki">
<!ENTITY version "2021.10.17">
<!ENTITY md5 "345ae536972b749de9efe2717ba04dbb">
<!ENTITY version "2021.10.17a">
<!ENTITY md5 "dc57c53368af08621d06bc89a4b7e2bd">
<!ENTITY launch "Apps">
<!ENTITY plugdir "/usr/local/emhttp/plugins/&name;">
<!ENTITY github "Squidly271/community.applications">
@ -13,6 +13,11 @@
<PLUGIN name="&name;" author="&author;" version="&version;" launch="&launch;" pluginURL="&pluginURL;" min="6.9.0" support="https://lime-technology.com/forums/topic/38582-plug-in-community-applications/" icon="users">
<CHANGES>
###2021.10.17a
- Fixed: Certain apps would have the Installed flag showing when in Installed Apps
- Fixed: Pinned Apps were not honoring the sort order when initially going into that section
- Fixed: Going from Home / SHOW MORE to Installed / Previously Installed the sort order would be incorrect
###2021.10.17
- Complete overhaul of GUI
- Fixed: Disable categories after performing a dockerHub search
@ -1694,11 +1699,11 @@ THIS IS A REQUIRED UPDATE
<?
$version = parse_ini_file("/etc/unraid-version");
if ( version_compare($version['version'],"6.4.0", "<") )
if ( version_compare($version['version'],"6.9.0", "<") )
{
echo "********************************************************************\n";
echo "\n";
echo "Community Applications Requires unRaid version 6.4.0 or greater to run\n";
echo "Community Applications Requires unRaid version 6.9.0 or greater to run\n";
echo "\n";
echo "********************************************************************\n";
exit(1);

2
source/community.applications/usr/local/emhttp/plugins/community.applications/Apps.page
View File

@ -1008,6 +1008,7 @@ function showModeration(script,title) {
}
function previousApps(installed,dontClear=false,filter="") {
checkSortOrder();
clearCategory();
setPageOne();
data.docker = "";
@ -1204,6 +1205,7 @@ function clearCategory() {
}
function pinnedApps() {
checkSortOrder();
setPageOne();
data.docker = "";
clearSearchBox();

6
source/community.applications/usr/local/emhttp/plugins/community.applications/ca.md5
View File

@ -1,8 +1,8 @@
9c0350429bd1d79fe3e43b7100755e3a ./Apps.page
0617ae7ed4011e05bef9cd6cac85dd5b ./Apps.page
83b3f89cd42e8601c7c217d5b4889c81 ./CA_notices.page
a7d2bd7a00a40feea38c424b3ab3af78 ./ca_settings.page
1a8d4d4ff5e8ddf8e911280e39e3d10d ./default.cfg
185a4f43f645d444ffd4a79bac3106ca ./include/exec.php
bc9057b2964bc3ebc45d3b7ce333f48f ./include/exec.php
881abd00cf784d706bba6a06f3b8c810 ./include/helpers.php
4eaa5bd1f2e88781133c1571a81e6d0c ./include/paths.php
eb76c1b6ed3da5e5b393f22d2ec18430 ./javascript/libraries.js
@ -22,4 +22,4 @@ b398273cf7daa62ab00d2de2336ca25f ./README.md
2bd671daecaf01549f8cc0202cb184b3 ./scripts/updatePluginSupport.php
289acc42c9cde7699c9c6f6e2815c6e1 ./skins/Narrow/css.php
4ff34c148d3dde1a420303faecd414ae ./skins/Narrow/skin.html
0dec26e10cd9028694cd1fb24226740b ./skins/Narrow/skin.php
e649b589fe212eb3eca3f6e55c7fde17 ./skins/Narrow/skin.php

1
source/community.applications/usr/local/emhttp/plugins/community.applications/include/exec.php
View File

@ -1266,6 +1266,7 @@ function pinnedApps() {
}
}
}
usort($displayed,"mySort");
$displayedApplications['community'] = $displayed;
$displayedApplications['pinnedFlag'] = true;
writeJsonFile($caPaths['community-templates-displayed'],$displayedApplications);

4
source/community.applications/usr/local/emhttp/plugins/community.applications/skins/Narrow/skin.php
View File

@ -110,8 +110,8 @@ function my_display_apps($file,$pageNumber=1,$selectedApps=false,$startup=false)
$tmpRepo = "library/$tmpRepo";
}
foreach ($dockerRunning as $testDocker) {
if ( $tmpRepo == $testDocker['Image'] || "$tmpRepo:latest" == $testDocker['Image'] && $template['Name'] == $testDocker['Name'] && ! $template['Uninstall']) {
$template['Installed'] = true;
if ( ($tmpRepo == $testDocker['Image'] || "$tmpRepo:latest" == $testDocker['Image']) && ($template['Name'] == $testDocker['Name']) ) {
$template['Installed'] = ! $template['Uninstall']; // Stops the Installed flag from appearing within Installed apps
break;
}
}