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

Fixed: sidebar wasn't allowing a deprecated app in prev to be reinstalled

pull/11/head
Squidly271 2022-05-07 09:28:25 -04:00
parent 5d9cb81591
commit e32ce439d5
4 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

Binary file not shown.

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

@ -1116,7 +1116,6 @@ function closeSidebar(cookie=false,visible=false) {
} }
function installPlugin(pluginURL,update=false,comment="") { function installPlugin(pluginURL,update=false,comment="") {
alert(pluginURL);
type = update ? "update" : "install"; type = update ? "update" : "install";
title = update ? "<?tr("Update Plugin")?>" : "<?tr("Install Plugin")?>"; title = update ? "<?tr("Update Plugin")?>" : "<?tr("Install Plugin")?>";
closeSidebar(true); closeSidebar(true);

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

@ -1,4 +1,4 @@
7f92a472f8e7bc8fc51db9778abc9ed5 ./Apps.page c553881600c51459abaa336c920cd923 ./Apps.page
4e55f7483b661af21a25b677179baffe ./CA_notices.page 4e55f7483b661af21a25b677179baffe ./CA_notices.page
42a1658a916a3a3eed2a9f2af80603c4 ./ca_settings.page 42a1658a916a3a3eed2a9f2af80603c4 ./ca_settings.page
e718d7825dbdc96a17a915079222b098 ./default.cfg e718d7825dbdc96a17a915079222b098 ./default.cfg
@ -21,4 +21,4 @@ da3b4f9b73c5c3bf65be6c42d68b51f9 ./scripts/showStatistics.php
34554a56611dfe625889c82afd5138de ./scripts/updatePluginSupport.php 34554a56611dfe625889c82afd5138de ./scripts/updatePluginSupport.php
ce8e45452d3b63b5943b6f39c817bbf9 ./skins/Narrow/css.php ce8e45452d3b63b5943b6f39c817bbf9 ./skins/Narrow/css.php
c4d6ce8de3baff1c9de2b7f348b2f340 ./skins/Narrow/skin.html c4d6ce8de3baff1c9de2b7f348b2f340 ./skins/Narrow/skin.html
484b42f519e72726c857a9c9d19954d1 ./skins/Narrow/skin.php 5a32f61db7136c31198b3ca194bc688c ./skins/Narrow/skin.php

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

@ -660,13 +660,13 @@ function getPopupDescriptionSkin($appNumber) {
} }
} elseif ( ! $template['Blacklist'] ) { } elseif ( ! $template['Blacklist'] ) {
if ( $template['Compatible'] || $caSettings['hideIncompatible'] !== "true") { if ( $template['Compatible'] || $caSettings['hideIncompatible'] !== "true") {
if ( !$template['Deprecated'] || $caSettings['hideDeprecated'] !== "true" ) { // if ( !$template['Deprecated'] || $caSettings['hideDeprecated'] !== "true" ) {
if ( ($template['RequiresFile'] && is_file($template['RequiresFile']) ) || ! $template['RequiresFile'] ) { if ( ($template['RequiresFile'] && is_file($template['RequiresFile']) ) || ! $template['RequiresFile'] ) {
$buttonTitle = $template['InstallPath'] ? tr("Reinstall") : tr("Install"); $buttonTitle = $template['InstallPath'] ? tr("Reinstall") : tr("Install");
$isDeprecated = $template['Deprecated'] ? "&deprecated" : ""; $isDeprecated = $template['Deprecated'] ? "&deprecated" : "";
$actionsContext[] = array("icon"=>"ca_fa-install","text"=>$buttonTitle,"action"=>"installPlugin('{$template['PluginURL']}$isDeprecated');"); $actionsContext[] = array("icon"=>"ca_fa-install","text"=>$buttonTitle,"action"=>"installPlugin('{$template['PluginURL']}$isDeprecated');");
} }
} // }
} }
if ( $template['InstallPath'] ) { if ( $template['InstallPath'] ) {
if ( ! empty($actionsContext) ) if ( ! empty($actionsContext) )