Voicenumbers can now exist without blocks

This commit is contained in:
Frank Schubert
2023-06-01 13:55:39 +02:00
parent 7216b3339d
commit bbb2bcd615
4 changed files with 55 additions and 49 deletions
@@ -58,34 +58,27 @@ class VoicenumberController extends mfBaseController {
$r = $this->request;
//var_dump($r);exit;
$block_id = $r->block_id;
if(!is_numeric($block_id) || !$block_id) {
$this->layout()->setFlash("Rufnummer nicht gefunden1", "error");
$num = (string)$r->number;
if(!strlen($num)) {
$this->layout()->setFlash("Rufnummer nicht gefunden", "error");
$this->redirect("Voicenumberblock");
}
$block = new Voicenumberblock($block_id);
if(!$block->id) {
$this->layout()->setFlash("Rufnummer nicht gefunden2", "error");
$this->redirect("Voicenumberblock");
}
$num = (string)$r->number;
if(!strlen($num)) {
$this->layout()->setFlash("Rufnummer nicht gefunden3", "error");
$this->redirect("Voicenumberblock", "Index", null, ["block" => $block->id]);
}
if(!$block->isNumberInBlock($num)) {
if($block->id && !$block->isNumberInBlock($num)) {
$this->layout()->setFlash("Rufnummer nicht gefunden4", "error");
$this->redirect("Voicenumberblock", "Index", null, ["block" => $block->id]);
}
$number = VoicenumberModel::getFirst(["block_id" => $block_id, "number" => (string)$num]);
$number = VoicenumberModel::getFirst(["number" => (string)$num]);
$mode = "edit";
if(!$number) {
$number = new Voicenumber();
$number->loadFromBlock($block);
if($block->id) $number->voicenumberblock_id = $block->id;
$number->number = $num;
$number->create_by = $this->me->id;
$mode = "add";