blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-07-22 17:32:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

bug address.js, phrase Notiz

Browse Source
This commit is contained in:
ma0068
2024-11-20 16:22:39 +01:00
parent b189ac8cd0
commit d17c776905
6 changed files with 33 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/controllers/api/frontend/v1/stv/Kontakt.php
+5 -2
View File
@@ -230,7 +230,10 @@ class Kontakt extends FHCAPI_Controller
'numeric' => $this->p->t('ui', 'error_fieldNotNumeric', ['field' => 'PLZ'])
]);
if(isset($_POST['gemeinde']) && isset($_POST['ort']) && isset($_POST['nation']) && ($_POST['nation'] == 'A'))
if(isset($_POST['gemeinde']) && ($_POST['gemeinde'] != '')
&& isset($_POST['ort']) && ($_POST['ort'] != '')
&& isset($_POST['nation']) && ($_POST['nation'] == 'A')
&& isset($_POST['plz']) && ($_POST['plz'] != '') )
{
$this->form_validation->set_rules('address.plz', 'Postleitzahl', 'callback_validateLocationCombination', [
'validateLocationCombination' => $this->p->t('ui', 'error_location_combination')
@@ -278,7 +281,7 @@ class Kontakt extends FHCAPI_Controller
'strasse' => $strasse,
'updatevon' => $uid,
'updateamum' => date('c'),
'plz' => $_POST['address']['plz'],
'plz' => $_POST['plz'],
'ort' => $ort,
'gemeinde' => $gemeinde,
'nation' => $nation,
public/js/components/Notiz/Notiz.js
+2
View File
@@ -126,6 +126,7 @@ export default {
let button = document.createElement('button');
button.className = 'btn btn-outline-secondary btn-action';
button.title = this.$p.t('ui', 'notiz_edit');
button.innerHTML = '<i class="fa fa-edit"></i>';
button.addEventListener(
'click',
@@ -136,6 +137,7 @@ export default {
button = document.createElement('button');
button.className = 'btn btn-outline-secondary btn-action';
button.title = this.$p.t('notiz', 'notiz_delete');
button.innerHTML = '<i class="fa fa-xmark"></i>';
button.addEventListener(
'click',
public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Address.js
+2 -3
View File
@@ -169,9 +169,9 @@ export default{
cm.getColumnByField('person_id').component.updateDefinition({
title: this.$p.t('person', 'person_id')
});
cm.getColumnByField('actions').component.updateDefinition({
/* cm.getColumnByField('actions').component.updateDefinition({
title: this.$p.t('global', 'aktionen')
});
});*/
}
}
],
@@ -269,7 +269,6 @@ export default{
.catch(this.$fhcAlert.handleSystemError);
},
updateAddress(adresse_id) {
//TODO(Manu) buggy with relad, warning/error: e.element.after is not a function
this.addressData.plz = this.addressData.address.plz;
return this.$refs.addressData.factory.stv.kontakt.updateAddress(adresse_id,
this.addressData
public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Bankaccount.js
+2 -2
View File
@@ -128,9 +128,9 @@ export default{
cm.getColumnByField('bankverbindung_id').component.updateDefinition({
title: this.$p.t('ui', 'bankverbindung_id')
});
cm.getColumnByField('actions').component.updateDefinition({
/* cm.getColumnByField('actions').component.updateDefinition({
title: this.$p.t('global', 'aktionen')
});
});*/
}
}
],
public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Contact.js
+2 -2
View File
@@ -124,9 +124,9 @@ export default{
cm.getColumnByField('standort_id').component.updateDefinition({
title: this.$p.t('ui', 'standort_id')
});
cm.getColumnByField('actions').component.updateDefinition({
/* cm.getColumnByField('actions').component.updateDefinition({
title: this.$p.t('global', 'aktionen')
});
});*/
}}
],
lastSelected: null,
system/phrasesupdate.php
+20
View File
@@ -23371,6 +23371,26 @@ array(
)
)
),
array(
'app' => 'core',
'category' => 'notiz',
'phrase' => 'notiz_delete',
'insertvon' => 'system',
'phrases' => array(
array(
'sprache' => 'German',
'text' => 'Notiz löschen',
'description' => '',
'insertvon' => 'system'
),
array(
'sprache' => 'English',
'text' => 'Delete Note',
'description' => '',
'insertvon' => 'system'
)
)
),
array(
'app' => 'core',
'category' => 'notiz',