Uninstalling from docker/plugin cat within Installed/Previous would display all apps when finished

pull/11/head
Squidly271 2021-05-09 14:42:28 -04:00
parent d3c9819cbe
commit 84762ef1ca
3 changed files with 11 additions and 4 deletions

View File

@ -117,6 +117,7 @@ data.prevpage = 0;
data.currentpage = 1;
data.searchFlag = false;
data.searchActive = false; // Sets whether changepage re-sorts the displayed templates.
data.previousAppsSection = ""; // The section the user is on within previous apps
var dockerSearchFlag = false;
var dockerNotEnabled;
var postCount = 0;
@ -335,21 +336,27 @@ $(function(){
var section = $(this).attr("data-category");
switch (section) {
case "installed_apps":
data.previousAppsSection = "";
previousApps(true);
break;
case "inst_docker":
data.previousAppsSection = "docker";
previousApps(true,false,"docker");
break;
case "inst_plugins":
data.previousAppsSection = "plugins";
previousApps(true,false,"plugins");
break;
case "previous_apps":
data.previousAppsSection = "";
previousApps(false);
break;
case "prev_docker":
data.previousAppsSection = "docker";
previousApps(false,false,"docker");
break;
case "prev_plugins":
data.previousAppsSection = "plugins";
previousApps(false,false,"plugins");
break;
case "pinned_apps":
@ -1002,7 +1009,7 @@ function removeApp(application, humanName) {
enableMultiInstall(); // update the count
post({action:'remove_application',application:application}, function(result) {
enableSearch();
previousApps(false,true);
previousApps(false,true,data.previousAppsSection);
});
} else {
enableSearch();
@ -1039,7 +1046,7 @@ function uninstallApp(application,humanName) {
}
function postUninstallPlugin() {
previousApps(true);
previousApps(true,false,data.previousAppsSection);
enableSearch();
}
@ -1096,7 +1103,7 @@ function uninstallDocker(application,humanName) {
myAlert("",sprintf(tr("Uninstalling %s"),humanName));
post({action:'uninstall_docker',application:application,noSpinner:true},function(result) {
enableSearch();
previousApps(true);
previousApps(true,false,data.previousAppsSection);
});
} else {
enableSearch();

View File

@ -1,6 +1,6 @@
767d6f2203fed9541daeb57bbf7b58b3 ./Apps.page
83b3f89cd42e8601c7c217d5b4889c81 ./CA_notices.page
dd790a180117d1c568663a7481e8ebd3 ./CommunityApps.page
9d7ad87eaab3adce92124672e696cd48 ./CommunityApps.page
6db73582f22dab13d329e862067ee84e ./PluginAPI.page
b398273cf7daa62ab00d2de2336ca25f ./README.md
1a908064914041c48be7bf0dab77515a ./ca_settings.page