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

Fix regression error below 

Re-add Install Update for plugins
Regression: Clicking Settings icon for plugin would open a new tab
pull/11/head
Squidly271 2021-03-13 13:24:51 -05:00
parent ed6ca7a568
commit f09ca9a9e6
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

Binary file not shown.

3
source/community.applications/usr/local/emhttp/plugins/community.applications/scripts/showStatistics.php
View File

@ -110,10 +110,11 @@ switch ($_GET['arg1']) {
}
$templates = readJsonFile($caPaths['community-templates-info']);
foreach ($templates as $template) {
$template['Repository'] = str_replace(":latest","",$template['Repository']);
$count = 0;
foreach ($templates as $searchTemplates) {
if ( $template['Language'] ) continue;
if ( ($template['Repository'] == $searchTemplates['Repository']) ) {
if ( ($template['Repository'] == str_replace(":latest","",$searchTemplates['Repository'])) ) {
if ( $searchTemplates['BranchName'] || $searchTemplates['Blacklist'] || $searchTemplates['Deprecated']) {
continue;
}

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

@ -206,12 +206,15 @@ function my_display_apps($file,$pageNumber=1,$selectedApps=false,$startup=false)
if ( checkInstalledPlugin($template) ) {
$pluginSettings = $pluginName == "community.applications.plg" ? "ca_settings" : plugin("launch","/var/log/plugins/$pluginName");
$tmpVar = $pluginSettings ? "" : " disabled ";
$template['display_pluginSettingsIcon'] = $pluginSettings ? "<a class='ca_tooltip ca_fa-pluginSettings appIcons ca_href' title='".tr("Go to the plugin settings")."' data-href='/Apps/$pluginSettings'></a>" : "";
$template['display_pluginSettingsIcon'] = $pluginSettings ? "<a class='ca_tooltip ca_fa-pluginSettings appIcons ca_href' title='".tr("Go to the plugin settings")."' data-target='_self' data-href='/Apps/$pluginSettings'></a>" : "";
unset($template['display_multi_install']);
unset($template['display_removable']);
} else {
$template['display_pluginInstallIcon'] = "<a style='cursor:pointer' class='ca_tooltip ca_fa-install appIcons' title='".tr("Install plugin")."' onclick=installPlugin('{$template['PluginURL']}');></a>";
}
if ( $template['UpdateAvailable'] ) {
$template['display_pluginUpdate'] = "<a style='cursor:pointer' class='ca_tooltip ca_fa-update appIcons ca_href' title='".tr("Update plugin")."' data-target='_self' data-href='/Apps/Plugins'></a>";
}
} else {
if ( $caSettings['dockerRunning'] ) {
if ( $selected ) {
@ -1012,7 +1015,7 @@ function displayCard($template) {
</div>
<div class='ca_hr'></div>
<div class='ca_bottomLine'>
{$template['display_multi_install']}{$template['display_languageUpdate']}{$template['display_languageInstallIcon']}{$template['display_language_switch']}{$template['display_pluginInstallIcon']}{$template['display_dockerInstallIcon']} $dockerReinstall {$template['display_dockerReinstallIcon']} {$template['display_dockerEditIcon']} {$template['display_pluginSettingsIcon']}{$template['display_infoIcon']} {$template['dockerWebIcon']}{$template['display_profile']}{$template['display_webpage']}{$template['display_faSupport']}{$template['display_twitter']}{$template['display_reddit']}{$template['display_discord']}{$template['display_facebook']} {$template['display_faProject']} {$template['display_pinButton']}{$template['display_repoSearch']}{$template['display_faFavourite']}{$template['display_favouriteButton']}
{$template['display_multi_install']}{$template['display_pluginUpdate']}{$template['display_languageUpdate']}{$template['display_languageInstallIcon']}{$template['display_language_switch']}{$template['display_pluginInstallIcon']}{$template['display_dockerInstallIcon']} $dockerReinstall {$template['display_dockerReinstallIcon']} {$template['display_dockerEditIcon']} {$template['display_pluginSettingsIcon']}{$template['display_infoIcon']} {$template['dockerWebIcon']}{$template['display_profile']}{$template['display_webpage']}{$template['display_faSupport']}{$template['display_twitter']}{$template['display_reddit']}{$template['display_discord']}{$template['display_facebook']} {$template['display_faProject']} {$template['display_pinButton']}{$template['display_repoSearch']}{$template['display_faFavourite']}{$template['display_favouriteButton']}
<span class='ca_bottomRight'>
{$template['display_removable']} {$template['display_Uninstall']}
</span>