43305 refactor code

onOffice-Web-Org · Jan 16, 2024 · 51669e5 · 51669e5
1 parent cb96348
commit 51669e5
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/plugin/Field/OutputFields.php b/plugin/Field/OutputFields.php
@@ -76,8 +76,9 @@ public function getVisibleFilterableFields(
 
 		$allFields = array_merge($fieldsArray, array_keys($geoFields));
 		$valuesDefault = array_map(function($field) use ($geoFields, $pInputVariableReader) {
-			$value = $pInputVariableReader->getFieldValueFormatted($field);
-			return $value === false ? false : ($value ?? null);
+			$fieldValue = $pInputVariableReader->getFieldValueFormatted($field);
+			$geoFieldValue = $geoFields[$field] ?? null;
+			return $fieldValue === false ? false : ($fieldValue !== null ? true : ($geoFieldValue !== null ? true : null));
 		}, $allFields);
 
 		$resultDefault = array_combine($allFields, $valuesDefault);

diff --git a/templates.dist/fields.php b/templates.dist/fields.php
@@ -207,7 +207,7 @@ function renderFormField(string $fieldName, onOffice\WPlugin\Form $pForm, bool $
 			} elseif ($typeCurrentInput === FieldTypes::FIELD_TYPE_DATATYPE_TINYINT) {
 				$output = '<fieldset>
 					<input type="radio" id="' . esc_attr($fieldName) . '_u" name="' . esc_attr($fieldName) . '" value=""
-						' . ($selectedValue === "" ? ' checked' : '') . '>
+						' . ($selectedValue === null ? ' checked' : '') . '>
 					<label for="' . esc_attr($fieldName) . '_u">' . esc_html__('Not Specified', 'onoffice-for-wp-websites') . '</label>
 					<input type="radio" id="' . esc_attr($fieldName) . '_y" name="' . esc_attr($fieldName) . '" value="1"
 						' . ($selectedValue == 2 ? 'checked' : '') . '>

diff --git a/tests/TestClassFieldsCollectionBuilderShort.php b/tests/TestClassFieldsCollectionBuilderShort.php
@@ -36,6 +36,7 @@
 use onOffice\WPlugin\Region\RegionController;
 use onOffice\WPlugin\SDKWrapper;
 use onOffice\WPlugin\Types\FieldsCollection;
+use onOffice\WPlugin\Types\Field;
 use WP_UnitTestCase;
 use function json_decode;
 
@@ -252,7 +253,9 @@ public function testCombination()
 	public function testAddFieldSupervisorForSearchCriteria()
 	{
 		$pFieldsCollection = new FieldsCollection();
+		$field = new Field('benutzer', onOfficeSDK::MODULE_SEARCHCRITERIA, 'testLabel');
+		$pFieldsCollection->addField($field);
 		$this->assertSame($this->_pSubject, $this->_pSubject->addFieldSupervisorForSearchCriteria($pFieldsCollection));
-		$this->assertCount(1, $pFieldsCollection->getAllFields());
+		$this->assertCount(2, $pFieldsCollection->getAllFields());
 	}
 }