mirrors
/
community.applications
mirror of https://github.com/Squidly271/community.applications.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

cards wouldn't reflect plugin update available until feed knew

pull/11/head
Squidly271 2022-06-12 17:20:50 -04:00
parent 5d6d009915
commit ecf9971e3a
5 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
archive/community.applications-2022.06.12-x86_64-1.txz
View File

Binary file not shown.

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

@ -2939,7 +2939,7 @@ function setupActionCentre() {
function postCheckForUpdates() {
setupActionCentre();
refreshDisplay();
$(".selectedMenu").click();
}
</script>

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

@ -1,4 +1,4 @@
d8a6a51040dda9a918fa40fcfc2aaa84 ./Apps.page
d657db06b3f6dac2c1ad595e37447994 ./Apps.page
4e55f7483b661af21a25b677179baffe ./CA_notices.page
42a1658a916a3a3eed2a9f2af80603c4 ./ca_settings.page
e718d7825dbdc96a17a915079222b098 ./default.cfg
@ -21,5 +21,5 @@ da3b4f9b73c5c3bf65be6c42d68b51f9 ./scripts/showStatistics.php
4425f8fd4ef662a7dc65cee01de3e419 ./scripts/updatePLG.sh
34554a56611dfe625889c82afd5138de ./scripts/updatePluginSupport.php
25bdaed6f62ac73f9ef7c3ce0c125ef7 ./skins/Narrow/css.php
7c7e02f401265315151e9fb3fcf1bd7d ./skins/Narrow/skin.html
3a6512556984cbc315bee35d4fb26b54 ./skins/Narrow/skin.php
3e76bb2f7ac6db500d1d91072deb68aa ./skins/Narrow/skin.html
40d7e4e4b35b4ecce7918567ac080589 ./skins/Narrow/skin.php

5
source/community.applications/usr/local/emhttp/plugins/community.applications/skins/Narrow/skin.html
View File

@ -51,12 +51,11 @@
</div>
<div id="Category" class="categoryLine">&nbsp;
</div>
<div class='dockerSearch' style='display:none'><a class='initDockerSearch'><?tr("Click Here To Get More Results From DockerHub");?></a></div>
<div class='dockerSearch' style='display:none'><a class='initDockerSearch'><?tr("Click Here To Get More Results From DockerHub");?></a></div>
<div id='sortIconArea' style='display:none;'><?tr("Sort By:")?> <a id='defaultSort' class='sortIcons enabledIcon' data-sortBy='Name' data-sortDir='Up'><?tr("Name Ascending")?></a><a class='sortIcons' data-sortBy='Name' data-sortDir='Down'><?tr("Name Descending")?></a><a class='sortIcons' data-sortBy='downloads' data-sortDir='Down'><?tr("Downloads")?></a><a class='sortIcons' data-sortBy='FirstSeen' data-sortDir='Down'><?tr("Date Added")?></a></span></div>
<div class='checkForUpdates'><input class='checkForUpdatesButton' type='button' value='<?tr("Check For Updates")?>'></input></div>
<div id='templates_content'><div class='ca_templatesDisplay'><font size='6'><?tr("Updating Content");?></font></div></div>
<div class='multi_installDiv'><input class='multi_install multi_installButton' type='button' value='<?tr("Install Selected Applications");?>' disabled><input type='button' class='multi_installAll' value='<?tr("Select all on page")?>'><input type='button' class='multi_installClear' value='<?tr("Clear")?>' disabled><input type='button' class='multi_deleteButton' style='visibility:hidden;' value='<?tr("Delete")?>'></input></div>
<div class='checkForUpdates'><input class='checkForUpdatesButton' type='button' value='<?tr("Check For Updates")?>'></input></div>
</div>
</div>
<span id='debugging'></span>

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

@ -109,7 +109,6 @@ function my_display_apps($file,$pageNumber=1,$selectedApps=false,$startup=false)
$niceRepoName = str_replace("'s Repository","",$template['RepoName']);
$niceRepoName = str_replace("' Repository","",$niceRepoName);
$niceRepoName = str_replace(" Repository","",$niceRepoName);
// $favMsg = ($favClass == "ca_favouriteRepo") ? tr("Click to remove favourite repository") : tr(sprintf("Click to set %s as favourite repository",$niceRepoName));
$ct .= displayCard($template);
$count++;
@ -193,7 +192,15 @@ function my_display_apps($file,$pageNumber=1,$selectedApps=false,$startup=false)
} else {
$pluginName = basename($template['PluginURL']);
if ( file_exists("/var/log/plugins/$pluginName") ) {
if ( ( strcmp(plugin("version","/var/log/plugins/$pluginName"),$template['pluginVersion']) < 0 || $template['UpdateAvailable']) && $template['Name'] !== "Community Applications") {
$pluginInstalledVersion = plugin("version","/var/log/plugins/$pluginName");
if ( file_exists("/tmp/plugins/$pluginName") ) {
$tmpPluginVersion = plugin("version","/tmp/plugins/$pluginName");
if (strcmp($template['pluginVersion'],$tmpPluginVersion) < 0)
$template['pluginVersion'] = $tmpPluginVersion;
}
$template['pluginVersion'] = plugin("version","/tmp/plugins/$pluginName");
if ( ( strcmp($pluginInstalledVersion,$template['pluginVersion']) < 0 || $template['UpdateAvailable']) && $template['Name'] !== "Community Applications") {
@copy($caPaths['pluginTempDownload'],"/tmp/plugins/$pluginName");
$template['UpdateAvailable'] = true;
$actionsContext[] = array("icon"=>"ca_fa-update","text"=>tr("Update"),"action"=>"installPlugin('$pluginName',true,'','{$template['RequiresFile']}');");