mirrors/community.applications
1
0
Fork 0
mirror of https://github.com/Squidly271/community.applications.git synced 2025-06-03 14:52:13 +08:00
Code Issues Projects Releases Wiki Activity

Fixed: Keep checkmarks on prev apps when manually deleting or changing page

Browse Source
This commit is contained in:
Squidly271 2022-05-07 08:24:38 -04:00
parent c34d8d5d79
commit fc6164871e
5 changed files with 18 additions and 15 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 Normal file
View File

Binary file not shown.

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

@ -98,7 +98,7 @@ $dockerSearchActive = is_file($caPaths['dockerSearchActive']);
exec("mkdir -p {$caPaths['tempFiles']}"); exec("mkdir -p {$caPaths['tempFiles']}");
if ( ($cfg['updateCheck'] == "yes") && ( (time() - @filemtime($caPaths['updateTime']) ) > 3600 ) ) { if ( ($cfg['updateCheck'] == "yes") && ( (time() - @filemtime($caPaths['updateTime']) ) > 3600 ) ) {
touch($caPaths['updateTime']); touch($caPaths['updateTime']);
exec("echo '/usr/local/emhttp/plugins/community.applications/scripts/checkForUpdates.php >/dev/null 2>&1' | at now >/dev/null"); exec("echo '/usr/local/emhttp/plugins/community.applications/scripts/checkForUpdates.php >/dev/null 2>&1' | at now -M >/dev/null");
} }
if ( is_file("/var/run/dockerd.pid") && is_dir("/proc/".@file_get_contents("/var/run/dockerd.pid")) ) { if ( is_file("/var/run/dockerd.pid") && is_dir("/proc/".@file_get_contents("/var/run/dockerd.pid")) ) {
@ -750,16 +750,7 @@ $(function(){
}); });
} }
// set up action centre - run in background without tying anything up setupActionCentre();
$.post("/plugins/<?=$plugin?>/include/exec.php",{action:'enableActionCentre'},function(data) {
console.log("Action Centre");
console.log(data);
var ret = JSON.parse(data);
if ( ret.status == "action" )
$(".actionCentre").show();
else
$(".actionCentre").hide();
});
} }
}); });
@ -1330,6 +1321,7 @@ function uninstallApp(application,humanName) {
function postUninstallPlugin() { function postUninstallPlugin() {
enableSearch(); enableSearch();
$(".selectedMenu").trigger("click"); $(".selectedMenu").trigger("click");
setupActionCentre();
/* if ( $(".selectedMenu").data("category") == "action_centre" ) { /* if ( $(".selectedMenu").data("category") == "action_centre" ) {
actionCentre(); actionCentre();
} else { } else {
@ -2770,6 +2762,17 @@ function getPerPageOpts(value) {
return maxPerPageOpts; return maxPerPageOpts;
} }
function setupActionCentre() {
// set up action centre - run in background without tying anything up
$.post("/plugins/<?=$plugin?>/include/exec.php",{action:'enableActionCentre'},function(data) {
var ret = JSON.parse(data);
if ( ret.status == "action" )
$(".actionCentre").show();
else
$(".actionCentre").hide();
});
}
</script> </script>
<?include "/usr/local/emhttp/plugins/$plugin/skins/Narrow/skin.html"?> <?include "/usr/local/emhttp/plugins/$plugin/skins/Narrow/skin.html"?>

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

@ -1,8 +1,8 @@
0a73f51e10e69d62605e86966f1c3677 ./Apps.page 5be3aa6e039b55c585b9364c09a72a99 ./Apps.page
4e55f7483b661af21a25b677179baffe ./CA_notices.page 4e55f7483b661af21a25b677179baffe ./CA_notices.page
42a1658a916a3a3eed2a9f2af80603c4 ./ca_settings.page 42a1658a916a3a3eed2a9f2af80603c4 ./ca_settings.page
e718d7825dbdc96a17a915079222b098 ./default.cfg e718d7825dbdc96a17a915079222b098 ./default.cfg
7930be47328560e57c25b81b417eb315 ./include/exec.php ac88336a82f361a128b5dd7e43237072 ./include/exec.php
d5ba81dbd93c7b149dec96def31107e9 ./include/helpers.php d5ba81dbd93c7b149dec96def31107e9 ./include/helpers.php
fc87642746ba4f324537bc381b78e982 ./include/paths.php fc87642746ba4f324537bc381b78e982 ./include/paths.php
532fffdf939594c143e679da02bd841e ./javascript/libraries.js 532fffdf939594c143e679da02bd841e ./javascript/libraries.js
@ -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
444485f96e18f42d42612efd4ba5066e ./skins/Narrow/skin.php 07b1886782ee6418f82e0724d6ba8f6f ./skins/Narrow/skin.php

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

@ -956,7 +956,6 @@ function display_content() {
$pageNumber = getPost("pageNumber","1"); $pageNumber = getPost("pageNumber","1");
$startup = getPost("startup",false); $startup = getPost("startup",false);
$selectedApps = json_decode(getPost("selected",false),true); $selectedApps = json_decode(getPost("selected",false),true);
$o['display'] = ""; $o['display'] = "";
if ( file_exists($caPaths['community-templates-displayed']) || file_exists($caPaths['repositoriesDisplayed']) ) { if ( file_exists($caPaths['community-templates-displayed']) || file_exists($caPaths['repositoriesDisplayed']) ) {
$o['display'] = "<div class='ca_templatesDisplay'>".display_apps($pageNumber,$selectedApps,$startup)."</div>"; $o['display'] = "<div class='ca_templatesDisplay'>".display_apps($pageNumber,$selectedApps,$startup)."</div>";

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

@ -289,6 +289,7 @@ function my_display_apps($file,$pageNumber=1,$selectedApps=false,$startup=false)
$template['Facebook'] = $template['Facebook'] ?: $repositories[$template['Repo']]['Facebook']; $template['Facebook'] = $template['Facebook'] ?: $repositories[$template['Repo']]['Facebook'];
$template['Discord'] = $template['Discord'] ?: $repositories[$template['RepoName']]['Discord']; $template['Discord'] = $template['Discord'] ?: $repositories[$template['RepoName']]['Discord'];
$previousAppName = $template['Plugin'] ? $template['PluginURL'] : $template['Name'];
$template['checked'] = $checkedOffApps[$previousAppName] ? "checked" : ""; $template['checked'] = $checkedOffApps[$previousAppName] ? "checked" : "";
if ( ! $template['Plugin'] ) { if ( ! $template['Plugin'] ) {