When installing from previous apps, the startup category would be highlighted when returning to CA

pull/11/head
Squidly271 2021-06-26 15:21:38 -04:00
parent f73ae7090e
commit c524b66e4d
4 changed files with 3 additions and 7 deletions

View File

@ -830,8 +830,6 @@ function changeSortOrder(button,buttonClass,previousApps) {
if ( button || buttonClass || previousApps) {
data.searchFlag = false;
}
console.log("data");
console.log(data);
$(".startupButton").each(function(){
if ($(this).hasClass("selectedMenu")) {
@ -1473,7 +1471,6 @@ function saveState() {
categoriesEnabled.push($(this).data("category"));
});
$.cookie("ca_categories_enabled",JSON.stringify(categoriesEnabled));
console.log(categoriesEnabled);
$.cookie("ca_selectedMenu",selectedMenu);
$.cookie("ca_sortIcon",isIconEnabled("#sortIcon"));
$.cookie("ca_filter",$("#searchBox").val());
@ -1701,7 +1698,6 @@ function getCategories() {
}
});
restoreStateMenu = $.cookie("ca_selectedMenu");
if ( ! restoreStateMenu )
restoreStateMenu = $.cookie("ca_startupButton");

View File

@ -1,6 +1,6 @@
767d6f2203fed9541daeb57bbf7b58b3 ./Apps.page
83b3f89cd42e8601c7c217d5b4889c81 ./CA_notices.page
8a83f758f3093a0f07e0cbe26dc0d442 ./CommunityApps.page
5e342351d3b4faaf027b08d8b7381e82 ./CommunityApps.page
6db73582f22dab13d329e862067ee84e ./PluginAPI.page
b398273cf7daa62ab00d2de2336ca25f ./README.md
a9d4cd0e4e1f37cbe3806b952a96ddb1 ./ca_settings.page
@ -11,7 +11,7 @@ a9d4cd0e4e1f37cbe3806b952a96ddb1 ./ca_settings.page
6e48a62b91bdd066f023f46c6b491afd ./images/discord-gray.svg
8e7dc33512b8a78f28d7179a972c7c34 ./images/discord-hover.svg
54e46db492ddb033dfeb2827c5efd4a8 ./images/discord-white.svg
bc51b35f12c05e0d9f8c2fd006a93058 ./include/exec.php
80bdc89e71ffd5432cef6c8b46714a38 ./include/exec.php
d7f50413cbaac1c6cb9ceaaef48f270a ./include/helpers.php
8f1129e0cdb994c6d1900192252433d8 ./include/paths.php
eb76c1b6ed3da5e5b393f22d2ec18430 ./javascript/libraries.js

View File

@ -1022,6 +1022,7 @@ if ( $caSettings['dockerRunning'] ) {
foreach ($file as &$template) {
if ( $template['BranchID'] ) continue;
if ( $template['Blacklist'] ) continue;
if ( $installedName == $template['Name'] ) {
if ( startsWith($installedImage,$template['Repository']) ) {
$template['Uninstall'] = true;
@ -1029,7 +1030,6 @@ if ( $caSettings['dockerRunning'] ) {
if ( $dockerUpdateStatus[$installedImage]['status'] == "false" || $dockerUpdateStatus[$template['Name']] == "false" ) {
$template['UpdateAvailable'] = true;
}
if ($template['Blacklist'] ) continue;
$template['testrepo'] = $installedImage;
$displayed[] = $template;
break;