41951 add condition show property status for unit detail

onOffice-Web-Org · Apr 9, 2024 · 1241858 · 1241858
1 parent 230d5b9
commit 1241858
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 3 deletions.
diff --git a/plugin/EstateList.php b/plugin/EstateList.php
@@ -490,7 +490,12 @@ public function estateIterator($modifier = EstateViewFieldModifierTypes::MODIFIE
 		}
 		$recordRaw = $this->_recordsRaw[$this->_currentEstate['id']]['elements'] ?? [];
 
-		if ($this->getShowEstateMarketingStatus()) {
+		$showEstateMarketingStatusOfUnitList = false;
+		if ($this->_unitsViewName != null) {
+			$showEstateMarketingStatusOfUnitList = $this->_pEnvironment->getEstateUnitsByName($this->_unitsViewName)->getShowEstateMarketingStatus();
+		}
+
+		if ($this->getShowEstateMarketingStatus() || $showEstateMarketingStatusOfUnitList) {
 			$pEstateStatusLabel = $this->_pEnvironment->getEstateStatusLabel();
 			$recordModified['vermarktungsstatus'] = $pEstateStatusLabel->getLabel($recordRaw);
 		}

diff --git a/plugin/EstateUnits.php b/plugin/EstateUnits.php
@@ -100,6 +100,14 @@ public function getSubEstateIds(int $estateId): array
 		return $this->_estateUnits[$estateId] ?? [];
 	}
 
+	/**
+	 * @return bool
+	 */
+	public function getShowEstateMarketingStatus(): bool
+	{
+		return $this->_pEstateUnitsConfiguration->getEstateList()->getShowEstateMarketingStatus();
+	}
+
 	/**
 	 * @param int $estateId
 	 * @return int

diff --git a/plugin/ScriptLoader/ScriptLoaderGenericConfigurationDefault.php b/plugin/ScriptLoader/ScriptLoaderGenericConfigurationDefault.php
@@ -152,7 +152,8 @@ private function isEstateListPage(string $content): bool
 	{
 		return $this->matchesShortcode($content, self::ESTATE_TAG, 'view', '[^"]*') &&
 				!$this->matchesShortcode($content, self::ESTATE_TAG, 'view', 'detail') ||
-				$this->matchesShortcode($content, self::ESTATE_TAG, 'units', '[^"]*');
+				$this->matchesShortcode($content, self::ESTATE_TAG, 'units', '[^"]*') &&
+				!$this->matchesShortcode($content, self::ESTATE_TAG, 'units', '.*detail.*');
 	}
 
 	/**
@@ -182,7 +183,7 @@ private function isFormPage(string $content): bool
 	 */
 	private function matchesShortcode(string $content, string $tag, string $attribute, string $valuePattern): bool
 	{
-		$pattern = '/\[' . $tag . '\s+' . $attribute . '="' . $valuePattern . '"\]/';
+		$pattern = '/\[' . preg_quote($tag, '/') . '\s+.*?' . preg_quote($attribute, '/') . '="' . $valuePattern . '".*?\]/';
 		return (bool) preg_match($pattern, $content);
 	}