Merge branch 'bug-52531/Studierendenverwaltung/Adressenhandling' into merge_FHC4_C4

This commit is contained in:
Harald Bamberger
2025-01-27 18:29:48 +01:00
2 changed files with 3 additions and 4 deletions
@@ -230,10 +230,7 @@ class Kontakt extends FHCAPI_Controller
'numeric' => $this->p->t('ui', 'error_fieldNotNumeric', ['field' => 'PLZ'])
]);
if(isset($_POST['gemeinde']) && ($_POST['gemeinde'] != '')
&& isset($_POST['ort']) && ($_POST['ort'] != '')
&& isset($_POST['nation']) && ($_POST['nation'] == 'A')
&& isset($_POST['plz']) && ($_POST['plz'] != '') )
if(isset($_POST['gemeinde']) && isset($_POST['ort']) && isset($_POST['nation']) && $_POST['nation'] == 'A')
{
$this->form_validation->set_rules('address.plz', 'Postleitzahl', 'callback_validateLocationCombination', [
'validateLocationCombination' => $this->p->t('ui', 'error_location_combination')
@@ -440,6 +440,7 @@ export default{
<form-input
v-else
type="text"
:label="$p.t('person/gemeinde')"
name="addressData.gemeinde"
:label="$p.t('person/gemeinde')"
v-model="addressData.gemeinde"
@@ -467,6 +468,7 @@ export default{
<form-input
v-else
type="text"
:label="$p.t('person/ort')"
name="ort"
:label="$p.t('person/ort')"
v-model="addressData.ort"