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

fixes some data handling errors in controller functions

Browse Source
This commit is contained in:
SimonGschnell
2024-02-12 09:07:51 +01:00
parent 90012856dc
commit b21d3448cb
3 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/controllers/Cis/ProfilUpdate.php
+4 -4
View File
@@ -206,22 +206,22 @@ class ProfilUpdate extends Auth_Controller
//? loops over all updateRequests from a user to validate if the new request is valid
$res = $this->ProfilUpdateModel->getProfilUpdatesWhere(["uid"=>$this->uid]);
$res = hasData($res) ? getData($res) : null;
if($res){
$pending_changes = array_filter($res, function($element) {
return $element->status == 'pending';
});
foreach($pending_changes as $update_request){
$existing_change = json_decode($update_request->requested_change);
$existing_change = $update_request->requested_change;
//? the user can add as many new kontakt/adresse as he likes
if( !isset($payload->add) && property_exists($existing_change,$identifier) && property_exists($payload,$identifier) && $existing_change->$identifier == $payload->$identifier){
if( !isset($payload->add) && property_exists($existing_change,$identifier) && property_exists($payload,$identifier) && $existing_change->$identifier == $payload->$identifier){
//? the kontakt_id / adresse_id of a change has to be unique
echo json_encode(error("cannot change the same resource twice"));
return;
}
elseif(!$identifier && $update_request->topic == $json->topic ){
//? if it is not a delete or add request than the topic has to be unique
echo json_encode(error("A request to change " . $json->topic . " is already open"));
application/models/person/Profil_update_model.php
+1
View File
@@ -51,6 +51,7 @@ class Profil_update_model extends DB_Model
//? queries the tbl_profil_updates without permissions of the user
public function getProfilUpdatesWhere($whereClause){
$res = $this->loadWhere($whereClause);
if(isError($res)){
return error("Could not load public.tbl_profil_update with whereClause");
public/js/components/Cis/Profil/MitarbeiterProfil.js
+6 -4
View File
@@ -149,7 +149,7 @@ export default {
Vue.$fhcapi.ProfilUpdate.selectProfilRequest().then((res)=>{
if(!res.error){
this.data.profilUpdates = res.data.retval?.length ? res.data.retval.sort(this.sortProfilUpdates) : null ;
this.data.profilUpdates = res.data?.length ? res.data.sort(this.sortProfilUpdates) : null ;
}
});
},
@@ -164,14 +164,16 @@ export default {
Vue.$fhcapi.ProfilUpdate.selectProfilRequest()
.then((res) =>{
if(!res.error){
this.data.profilUpdates = res.data.retval;
this.data.profilUpdates = res.data;
this.data.profilUpdates.sort(this.sortProfilUpdates);
}else{
alert("Error when fetching profile updates: " +res.data.retval);
console.log("Error when fetching profile updates: " +res.data);
}
})
.catch(err=>alert(err));
.catch(err=>{
console.log(err);
});
}
}).catch((e) => {
// Wenn der User das Modal abbricht ohne Änderungen