Просмотр исходного кода

Revert default filters and update tests URL for admins

Alan Lam 7 лет назад
Родитель
Сommit
5d66951b54
3 измененных файлов с 4 добавлено и 7 удалено
  1. 3 1
      controllers/account.php
  2. 0 5
      controllers/tests_admin_list.php
  3. 1 1
      views/test_list.php

+ 3 - 1
controllers/account.php

@@ -37,7 +37,9 @@ if($user->isTester() || $user->isAdmin()) {
 	$tests = $user->getPendingTests();
 	$tests_remaining = count($tests);
 
-	$tests_icon = new AccountIcon("Tests", "/account/tests", "clipboard-check");
+	$tests_url = $user->isAdmin() ? "/account/tests?custom=overdue_test" : "/account/tests";
+
+	$tests_icon = new AccountIcon("Tests", $tests_url, "clipboard-check");
 	$tests_icon->setCounter($tests_remaining);
 
 	$icons[] = $tests_icon;

+ 0 - 5
controllers/tests_admin_list.php

@@ -71,11 +71,6 @@ else if($location_internal_id) {
 if($test_id) $nvp["id"] = $test_id;
 if(strlen($pass) > 0) $nvp["pass"] = $pass;
 
-if(strlen($custom) == 0) {
-	$custom = "overdue_test";
-	--$filter_count_offset;
-}
-
 $filter_count = count($nvp);
 
 $sort = http::value("sort");

+ 1 - 1
views/test_list.php

@@ -168,7 +168,7 @@ $custom_filters = [
 							<label class="col-sm-4 col-form-label" for="custom">Custom Filter</label>
 							<div class="col-sm">
 								<select class="form-control" name="custom" id="custom">
-									<option value="none">Select custom filter</option>
+									<option value="">Select custom filter</option>
 									<?php
 									foreach($custom_filters as $value => $display) {
 										$selected = (strval($value) === strval($custom)) ? "selected" : "";