Skip to content
Snippets Groups Projects
Commit 7f945e90 authored by Hahn Axel (hahn)'s avatar Hahn Axel (hahn)
Browse files

Merge branch 'update-appmonitor' into 'master'

Update appmonitor

See merge request !93
parents 6101bbab c6d32226
No related branches found
No related tags found
No related merge requests found
...@@ -292,6 +292,20 @@ class projectlist extends base{ ...@@ -292,6 +292,20 @@ class projectlist extends base{
*/ */
function setDefaultView(){ function setDefaultView(){
if (localStorage.getItem("progress") && localStorage.getItem("progress")!=\'null\'){
$("#progressfilter").val(localStorage.getItem("progress"));
} else {
$("#progressfilter").val($("#progressfilter option:first").val());
}
if (localStorage.getItem("efilter") && localStorage.getItem("efilter")!=\'null\') {
$("#efilter").val(localStorage.getItem("efilter"));
window.setTimeout("filterTableByTyping();", 10);
}
// window.setTimeout("filterOverviewTable();", 10);
filterOverviewTable();
/*
if(localStorage.getItem("selectedPrj") && localStorage.getItem("selectedPrj")!=\'null\'){ if(localStorage.getItem("selectedPrj") && localStorage.getItem("selectedPrj")!=\'null\'){
$("#prjfilter").val(localStorage.getItem("selectedPrj")); $("#prjfilter").val(localStorage.getItem("selectedPrj"));
} else { } else {
...@@ -304,18 +318,6 @@ class projectlist extends base{ ...@@ -304,18 +318,6 @@ class projectlist extends base{
$("#phasefilter").val($("#phasefilter option:first").val()); $("#phasefilter").val($("#phasefilter option:first").val());
} }
if (localStorage.getItem("progress") && localStorage.getItem("progress")!=\'null\'){
$("#progressfilter").val(localStorage.getItem("progress"));
} else {
$("#progressfilter").val($("#progressfilter option:first").val());
}
// window.setTimeout("filterOverviewTable();", 10);
filterOverviewTable();
if (localStorage.getItem("efilter") && localStorage.getItem("efilter")!=\'null\') {
$("#efilter").val(localStorage.getItem("efilter"));
window.setTimeout("filterTableByTyping();", 10);
}
if (localStorage.getItem("role") && localStorage.getItem("role")!=\'null\') { if (localStorage.getItem("role") && localStorage.getItem("role")!=\'null\') {
$("#rolefilter").val(localStorage.getItem("role")); $("#rolefilter").val(localStorage.getItem("role"));
window.setTimeout("setrole();", 20); window.setTimeout("setrole();", 20);
...@@ -325,6 +327,7 @@ class projectlist extends base{ ...@@ -325,6 +327,7 @@ class projectlist extends base{
var sMode=localStorage.getItem("mode"); var sMode=localStorage.getItem("mode");
if (sMode)setview(sMode); if (sMode)setview(sMode);
} }
*/
} }
/** /**
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment