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

If installing a container (leaving CA) when coming back to CA don't re-display the Action Centre enabled banner

Browse Source
This commit is contained in:
Squidly271 2022-11-18 15:53:47 -05:00
parent e48afdb26e
commit 9bc83094b1
4 changed files with 24 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

Binary file not shown.

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

@ -169,6 +169,7 @@ var cookieWarning = false;
var dockerWarningAdded = false;
var backupServerWarning = false;
var restoreStateMenu = false;
var actionCentreRestoreState = false;
var initialStartup = true;
var repoBanner = false;
var repoBannerTimer = false;
@ -755,6 +756,7 @@ $(function(){
<? if ( $dockerSearchActive ): ?>
dockerSearch(data.currentpage);
<? else: ?>
actionCentreRestoreState = true;
refreshDisplay();
searchBoxAwesomplete.close();
initialStartup = true;
@ -776,7 +778,8 @@ $(function(){
}
});
}
if ( document.referrer.indexOf("/Apps/") > 1 )
actionCentreRestoreState = true;
setupActionCentre();
}
});
@ -3036,10 +3039,12 @@ function setupActionCentre() {
var ret = JSON.parse(data);
if ( ret.status == "action" ) {
if ( !$(".actionCentre").is(":visible") ) {
acBanner = addBannerWarning("<?tr("Action Centre Enabled")?>",false,true);
setTimeout(function() {
removeBannerWarning(acBanner);
},10000);
if ( ! actionCentreRestoreState ) {
acBanner = addBannerWarning("<?tr("Action Centre Enabled")?>",false,true);
setTimeout(function() {
removeBannerWarning(acBanner);
},10000);
}
$(".actionCentre").show();
}
} else

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

@ -1,4 +1,4 @@
3d1fe47f47f387020b491030789669c0 ./Apps.page
ae9874967a4715939f3e97c53676cc33 ./Apps.page
4e55f7483b661af21a25b677179baffe ./CA_notices.page
4c5d4598e1bafa46bd90c27cbe302122 ./ca_settings.page
e8d29607ec792ddf9f6832b10ee70fdc ./default.cfg
@ -10,7 +10,7 @@ e8d29607ec792ddf9f6832b10ee70fdc ./default.cfg
ebb6450725d05c53116c3c996b6abac1 ./scripts/checkForUpdates.php
99a9d58a49a7f6812f18bd4be2b563b9 ./scripts/checkForUpdates.sh
677ac9a29993ec57e09ec6a1856f1a11 ./scripts/dockerConvert.php
8eb6e62a41113a3bff297bb930d66139 ./scripts/installMulti.php
fd90eddf802e73550e891d474e556561 ./scripts/installMulti.php
e54e7ec1cbc312c11900977181b71380 ./scripts/installMultiPlugin.php
524afab04ca930f59117a846f819fb2f ./scripts/installPluginUpdate.sh
25b6119a7ce9330fe8a16f4eb969512d ./scripts/installUpdate.php

14
source/community.applications/usr/local/emhttp/plugins/community.applications/scripts/installMulti.php
View File

@ -41,7 +41,7 @@ $javascript = file_get_contents("/usr/local/emhttp/plugins/dynamix/javascript/dy
echo "<script>$javascript</script>";
if ( $_GET['docker'] ) {
echo "<div id='output'>";
/* echo "<div id='output'>";
$dockers = explode(",",$_GET['docker']);
echo sprintf(tr("Installing docker applications %s"),str_replace(",",", ",$_GET['docker']))."<br>";
$_GET['updateContainer'] = true;
@ -49,7 +49,17 @@ if ( $_GET['docker'] ) {
$_GET['communityApplications'] = true;
$_GET['mute'] = false;
@include($exeFile); # under new GUI, this line returns a duplicated session_start() error.
echo "</div>";
echo "</div>"; */
$dockers = explode(",",$_GET['docker']);
foreach ( $dockers as $docker ) {
if ( !$docker )
continue;
$_GET['docker'] = $docker;
include "/usr/local/emhttp/plugins/community.applications/scripts/installUpdate.php";
}
}
?>
<script>