From 378b2a46a47d5be43eb148565f3a0713fca1594a Mon Sep 17 00:00:00 2001
From: Axel Hahn <axel.hahn@iml.unibe.ch>
Date: Thu, 16 Apr 2015 08:58:17 +0200
Subject: [PATCH] - overview page: fix setting last filter

---
 .../deployment/classes/project.class.php        |  4 +++-
 .../deployment/classes/projectlist.class.php    | 17 ++++++++++-------
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/public_html/deployment/classes/project.class.php b/public_html/deployment/classes/project.class.php
index 04b54425..69c97fb9 100644
--- a/public_html/deployment/classes/project.class.php
+++ b/public_html/deployment/classes/project.class.php
@@ -2065,8 +2065,10 @@ class project {
         }
         if ($sFunction == "accept") {
             $sRole = 'developer';
-            if ($sNext == "live")
+            if ($sNext == "live"){
                 $sRole = 'pl';
+                // $aLinkdata[$sFunction]['icon']='glyphicon glyphicon-star';
+            }
         }
 
         $sClass = $sPhase;
diff --git a/public_html/deployment/classes/projectlist.class.php b/public_html/deployment/classes/projectlist.class.php
index 772e3365..7157983c 100644
--- a/public_html/deployment/classes/projectlist.class.php
+++ b/public_html/deployment/classes/projectlist.class.php
@@ -212,30 +212,33 @@ class projectlist extends base{
                     */
                     function setDefaultView(){
 
-                        if(localStorage.getItem("selectedPrj")!=\'null\'){
+                        if(localStorage.getItem("selectedPrj") && localStorage.getItem("selectedPrj")!=\'null\'){
                             $("#prjfilter").val(localStorage.getItem("selectedPrj"));
                         } else {
                             $("#prjfilter").val($("#prjfilter option:first").val());
                         }
 
-                        if (localStorage.getItem("selectedPhase")!=\'null\'){
+                        if (localStorage.getItem("selectedPhase") && localStorage.getItem("selectedPhase")!=\'null\'){
                             $("#phasefilter").val(localStorage.getItem("selectedPhase"));
                         } else {
                             $("#phasefilter").val($("#phasefilter option:first").val());
                         }
-                        window.setTimeout("filterOverviewTable();", 10);
+                        // window.setTimeout("filterOverviewTable();", 10);
+                        filterOverviewTable();
                         
-                        if (localStorage.getItem("efilter")!=\'null\') {
+                        if (localStorage.getItem("efilter") && localStorage.getItem("efilter")!=\'null\') {
                             $("#efilter").val(localStorage.getItem("efilter"));
                             window.setTimeout("filterTable();", 10);
                         }
-                        if (localStorage.getItem("role")!=\'null\') {
+                        if (localStorage.getItem("role") && localStorage.getItem("role")!=\'null\') {
                             $("#rolefilter").val(localStorage.getItem("role"));
                             window.setTimeout("setrole();", 20);
                         }
                         
-                        var sMode=localStorage.getItem("mode");
-                        if (sMode)setview(sMode);
+                        if (localStorage.getItem("mode") && localStorage.getItem("mode")!=\'null\') {
+                            var sMode=localStorage.getItem("mode");
+                            if (sMode)setview(sMode);
+                        }
                     }
                     
                     /**
-- 
GitLab