From f32c56b923baee3b78818b4775c9efe190b81dc6 Mon Sep 17 00:00:00 2001 From: hahn <axel.hahn@iml.unibe.ch> Date: Tue, 26 Nov 2013 13:40:09 +0100 Subject: [PATCH] =?UTF-8?q?-=20=C3=9Cbersicht:=20Klick=20filtert=20nach=20?= =?UTF-8?q?Projekt=20-=20fix:=20restore=20des=20letzten=20Filter-Zustands?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../deployment/classes/projectlist.class.php | 25 +++++++++++-------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/public_html/deployment/classes/projectlist.class.php b/public_html/deployment/classes/projectlist.class.php index 0af9a416..50928a26 100644 --- a/public_html/deployment/classes/projectlist.class.php +++ b/public_html/deployment/classes/projectlist.class.php @@ -79,7 +79,8 @@ class projectlist { $sOutPhases.=$oPrj->renderAllPhaseDetails($sPhase,true,false); } - $sOut2 .= '<div class="'.$sPrj.' '.$sTrClass.' prjbox" >' + $sOut2 .= '<div class="'.$sPrj.' '.$sTrClass.' prjbox" ' + . ' onclick="$(\'#prjfilter\').val(\''.$sPrj.'\'); window.setTimeout(\'filterOverviewTable();\', 10);setview(\'extended\');">' . '<strong>' . '<a href="/deployment/'.$sPrj.'/" ><i class=" icon-book"></i> '.$oPrj->getLabel().'</a>' . '</strong><br>' @@ -88,7 +89,8 @@ class projectlist { // render output $sOut.=' - <tr class="'.$sPrj.' '.$sTrClass.'" onclick="location.href=\'/deployment/'.$sPrj.'/\'"> + <!-- <tr class="'.$sPrj.' '.$sTrClass.'" onclick="location.href=\'/deployment/'.$sPrj.'/\'"> --> + <tr class="'.$sPrj.' '.$sTrClass.'" onclick="$(\'#prjfilter\').val(\''.$sPrj.'\'); window.setTimeout(\'filterOverviewTable();\', 10);"> <td class="prj"> <strong> <a href="/deployment/'.$sPrj.'/" ><i class=" icon-book"></i> '.$oPrj->getLabel().'</a> @@ -166,11 +168,14 @@ class projectlist { var sPrj=$("#prjfilter").val(localStorage.getItem("selectedPrj")); var sPhase=$("#phasefilter").val(localStorage.getItem("selectedPhase")); - window.setTimeout("filterOverviewTable();", 50); + if (sPrj + sPhase) { + window.setTimeout("filterOverviewTable();", 10); + } - $("#efilter").val(localStorage.getItem("efilter")); - // filterTable(); - window.setTimeout("filterTable();", 50); + if (localStorage.getItem("efilter")) { + $("#efilter").val(localStorage.getItem("efilter")); + window.setTimeout("filterTable();", 10); + } var sMode=localStorage.getItem("mode"); if (sMode)setview(sMode); @@ -227,10 +232,10 @@ class projectlist { '.$sPhaseFilter.' </select> - <a href="#" class="btn" id="btnresetfilter" - title="Filter zurücksetzen" - onclick="resetFilter();">Reset</a> </span> + <a href="#" class="" id="btnresetfilter" + title="Filter zurücksetzen" + onclick="resetFilter();"><i class="icon-remove"></i> Reset Filter</a> </div> @@ -254,7 +259,7 @@ class projectlist { </thead> <tbody> ' . $sOut . '</tbody></table>' - . '<script>setDefaultView();</script>'; + . '<script>window.setTimeout("setDefaultView();", 50);</script>'; } else { $sOut ='<strong>Hinweis</strong><br>' . 'Es wurde noch kein Projekt eingerichtet.<br><br>' -- GitLab