30852 Custom label doesn't work on first save in Similar Estate and D…

…etail Estate (#457) * fix custom label * format code * update custom label similar estate * refactor code * format code * format code * format code * format code * update custom label * format code * format code * format code * format code * update unit test * refactor code * update view reference
onOffice-Web-Org · Apr 4, 2023 · c4dbff4 · c4dbff4
1 parent c0a9f44
commit c4dbff4
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 23 deletions.
diff --git a/js/onoffice-custom-form-label.js b/js/onoffice-custom-form-label.js
@@ -17,7 +17,7 @@ onOffice.custom_labels_input_converter = function () {
             .querySelector('input[name*="oopluginfieldconfigformtranslatedlabels-value"].onoffice-input');
         var fieldname = element.parentElement.parentElement.parentElement
             .querySelector('span.menu-item-settings-name').textContent;
-        if (onOffice.custom_labels_inputs_converted.indexOf(fieldname) !== -1) {
+        if (onOffice.custom_labels_inputs_converted.indexOf(fieldname) !== -1 && fieldname !== 'dummy_key') {
             return;
         }
         onOffice.custom_labels_inputs_converted.push(fieldname);

diff --git a/plugin/EstateDetail.php b/plugin/EstateDetail.php
@@ -321,25 +321,4 @@ public function getShowEstateMarketingStatus(): bool
 		return $this->getDataView()->getShowStatus();
 	}
 
-	/**
-	 * @param string $field
-	 * @return string
-	 */
-	public function getFieldLabel($field): string
-	{
-		$pContainerBuilder = new ContainerBuilder;
-		$pContainerBuilder->addDefinitions(ONOFFICE_DI_CONFIG_PATH);
-		$pContainer = $pContainerBuilder->build();
-		$pLanguage = $pContainer->get(Language::class)->getLocale();
-		$pDataDetailViewHandler = new DataDetailViewHandler();
-		$dataDetailView = $pDataDetailViewHandler->getDetailView();
-		$dataDetailCustomLabel = $dataDetailView->getCustomLabels();
-		if(!empty($dataDetailCustomLabel[$field][$pLanguage])){
-			$fieldNewName = $dataDetailCustomLabel[$field][$pLanguage];
-		}else {
-			$recordType = onOfficeSDK::MODULE_ESTATE;
-			$fieldNewName = $this->getEnvironment()->getFieldnames()->getFieldLabel($field, $recordType);
-		}
-		return $fieldNewName;
-	}
 }
diff --git a/plugin/EstateList.php b/plugin/EstateList.php
@@ -509,6 +509,7 @@ public function getFieldLabel($field): string
 	{
 		$recordType = onOfficeSDK::MODULE_ESTATE;
 		$pFieldsCollection = new FieldsCollection();
+		$pLanguage = $this->_pEnvironment->getContainer()->get( Language::class )->getLocale();
 		$pFieldBuilderShort = $this->_pEnvironment->getContainer()->get(FieldsCollectionBuilderShort::class);
 		$listType = method_exists($this->_pDataView, 'getListType') ? $this->_pDataView->getListType() : null;
 		$pFieldBuilderShort
@@ -518,6 +519,14 @@ public function getFieldLabel($field): string
 			->addCustomLabelFieldsEstateFrontend($pFieldsCollection, $this->_pDataView->getName(), $listType);
 
 		$label = $pFieldsCollection->getFieldByModuleAndName($recordType, $field)->getLabel();
+
+		if ( $this->_pDataView instanceof DataDetailView || $this->_pDataView instanceof DataViewSimilarEstates ) {
+			$dataView = $this->_pDataView->getCustomLabels();
+			if (!empty( $dataView[ $field ][ $pLanguage ])) {
+				$label = $dataView[ $field ][ $pLanguage ];
+			}
+		}
+
 		$fieldNewName = esc_html($label);
 		return $fieldNewName;
 	}

diff --git a/plugin/Field/FieldModuleCollectionDecoratorCustomLabelEstate.php b/plugin/Field/FieldModuleCollectionDecoratorCustomLabelEstate.php
@@ -59,7 +59,14 @@ public function __construct(FieldModuleCollection $pFieldModuleCollection, $form
 		$this->_pFieldModuleCollection = $pFieldModuleCollection;
 		$this->_pContainer = $pContainer ?? $this->buildContainer();
 		$recordManagerReadForm = $this->_pContainer->get(RecordManagerReadListViewEstate::class);
-		$results = $recordManagerReadForm->getRowByName($formName, $typeList);
+		if($typeList === "reference"){
+			$results = $recordManagerReadForm->getRowByName($formName, null);
+		}else{
+			$results = $recordManagerReadForm->getRowByName($formName, $typeList);
+		}
+		if(empty($results['listview_id'])){
+			return;
+		}
 		$fieldsByFormIds = $recordManagerReadForm->getFieldconfigByListviewId(intval($results['listview_id']));
 
 		foreach ($fieldsByFormIds as $fieldsByFormId) {