Merge branch 'fronkdev' into 'master'

Fixed Breadcrumbs in ConstructionConsent

See merge request fronk/thetool!966
This commit is contained in:
Frank Schubert
2025-01-30 14:29:31 +00:00
5 changed files with 10 additions and 7 deletions

View File

@@ -6,8 +6,10 @@
<div class="page-title-right">
<ol class="breadcrumb m-0">
<li class="breadcrumb-item"><a href="<?= self::getUrl("Dashboard") ?>"><?= MFAPPNAME_SLUG ?></a></li>
<li class="breadcrumb-item"><a href="<?= self::getUrl("Preordercampaign") ?>">Zustimmungserklärungen</a></li>
<li class="breadcrumb-item active"><?= ($Action == "add") ? "neu" : "bearbeiten" ?></li>
<li class="breadcrumb-item"><a href="<?=self::getUrl("ConstructionConsentProject")?>">Zustimmungserklärungsprojekte</a></li>
<li class="breadcrumb-item"><a href="<?=self::getUrl("ConstructionConsent")?>">Zustimmungserklärungen</a></li>
<li class="breadcrumb-item"><a href="<?=self::getUrl("ConstructionConsent", "View", ["id" => $item->id])?>"><?=htmlentities($item->name)?></a></li>
<li class="breadcrumb-item active">bearbeiten</li>
</ol>
</div>
<h4 class="page-title">Zustimmungserklärung</h4>

View File

@@ -13,7 +13,8 @@ $pagination_entity_name = "Zustimmungserklärungen";
<div class="page-title-right">
<ol class="breadcrumb m-0">
<li class="breadcrumb-item"><a href="<?=self::getUrl("Dashboard")?>"><?=MFAPPNAME_SLUG?></a></li>
<li class="breadcrumb-item active">Zustimmmungserklärungen</li>
<li class="breadcrumb-item"><a href="<?=self::getUrl("ConstructionConsentProject")?>">Zustimmungserklärungen</a></li>
<li class="breadcrumb-item active">Übersicht<?=(array_key_exists("project_id", $filter) && $filter["project_id"]) ? " ".$project->name : ""?></li>
</ol>
</div>
<h4 class="page-title">Zustimmmungserklärungen</h4>

View File

@@ -10,7 +10,8 @@ $pagination_entity_name = "Adressen";
<div class="page-title-right">
<ol class="breadcrumb m-0">
<li class="breadcrumb-item"><a href="<?=self::getUrl("Dashboard")?>"><?=MFAPPNAME_SLUG?></a></li>
<li class="breadcrumb-item"><a href="<?=self::getUrl("ConstructionConsent")?>">Zustimmungserklärungen</a></li>
<li class="breadcrumb-item"><a href="<?=self::getUrl("ConstructionConsentProject")?>">Zustimmungserklärungsprojekte</a></li>
<li class="breadcrumb-item"><a href="<?=self::getUrl("ConstructionConsent", "Index", ["filter" => ["project_id" => $item->constructionconsentproject_id]])?>">Zustimmungserklärungen <?=$item->project->name?></a></li>
<li class="breadcrumb-item active"><?=$item->name?></li>
</ol>
</div>

View File

@@ -13,8 +13,7 @@ $pagination_entity_name = "Zustimmungserklärungsprojekte";
<div class="page-title-right">
<ol class="breadcrumb m-0">
<li class="breadcrumb-item"><a href="<?=self::getUrl("Dashboard")?>"><?=MFAPPNAME_SLUG?></a></li>
<li class="breadcrumb-item"><a href="<?=self::getUrl("ConstructionConsent")?>">Zustimmmungserklärungen</a></li>
<li class="breadcrumb-item active">Projekte</li>
<li class="breadcrumb-item active">Zustimmungserklärungsprojekte</li>
</ol>
</div>
<h4 class="page-title">Zustimmmungserklärungen</h4>

View File

@@ -116,7 +116,7 @@ class ConstructionConsentHistory extends mfBaseModel {
}
if(!is_object($value)) {
return $value;
return htmlentities($value);
}
if(get_class($value) == "Preorderstatus") {