Luca/thetool
1
0
Fork 0
Code Issues 5 Pull Requests 5 Actions Packages Projects Releases Wiki Activity

Added Prepatching

Browse Source
This commit is contained in:
Frank Schubert
2021-11-23 20:11:35 +01:00
parent 847bf960a2
commit cbac36e96a
4 changed files with 121 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
application/Patching/PatchingController.php
View File

@@ -78,10 +78,20 @@ class PatchingController extends mfBaseController {
}
//var_dump($terms_search);exit;
$pagination['maxItems'] = PatchingModel::searchByTerminationCount($terms_search);
foreach(PatchingModel::searchByTermination($terms_search, $pagination) as $t) {
if(!array_key_exists($t->id, $terms)) {
$terms[$t->id] = $t;
if($filter["prepatched"]) {
$pagination['maxItems'] = PatchingModel::searchByEnabledPatchingCount($terms_search);
foreach(PatchingModel::searchByEnabledPatching($terms_search, $pagination) as $t) {
if(!array_key_exists($t->id, $terms)) {
$terms[$t->id] = $t;
}
}
} else {
$pagination['maxItems'] = PatchingModel::searchByFinishedLineworkCount($terms_search);
foreach(PatchingModel::searchByFinishedLinework($terms_search, $pagination) as $t) {
if(!array_key_exists($t->id, $terms)) {
$terms[$t->id] = $t;
}
}
}
@@ -117,16 +127,15 @@ class PatchingController extends mfBaseController {
if($filter["patched"] == "1") {
$new_filter["patched"] = true;
$new_filter["hide_delayed_finish"] = false;
} else {
} elseif ($filter["patched"] == "2") {
$new_filter["patched"] = false;
$new_filter["prepatched"] = true;
}
unset($filter["patched"]);
} else {
$new_filter["patched"] = false;
}
foreach($filter as $name => $value) {
$new_filter[$name] = $value;
}