From c0b07ac1d2d3dac8229e58748b3a6855194f0a51 Mon Sep 17 00:00:00 2001
From: OliiverHacker <hacker@technikum-wien.at>
Date: Thu, 29 Apr 2021 11:12:32 +0200
Subject: [PATCH] fix bug when deleting ressource from projectphasen

---
 include/ressource.class.php     | 10 ++++++++--
 soap/ressource_projekt.soap.php |  2 +-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/include/ressource.class.php b/include/ressource.class.php
index a0567a5e9..e01be0df4 100644
--- a/include/ressource.class.php
+++ b/include/ressource.class.php
@@ -743,9 +743,15 @@ class ressource extends basis_db
 			return false;
 		}
 
-		$qry="DELETE FROM fue.tbl_projekt_ressource WHERE ressource_id =".$this->db_add_param($ressource_id, FHC_INTEGER, false)."
+		/*$qry="DELETE FROM fue.tbl_projekt_ressource WHERE ressource_id =".$this->db_add_param($ressource_id, FHC_INTEGER, false)."
                 AND projektphase_id=".$this->db_add_param($projektphase_id, FHC_INTEGER, false).';';
-
+		*/
+		$qry="
+				DELETE FROM fue.tbl_projekt_ressource pr
+				USING fue.tbl_ressource r
+				WHERE r.ressource_id =".$this->db_add_param($ressource_id, FHC_INTEGER, false). "
+				AND pr.projekt_ressource_id=".$this->db_add_param($project_ressource_id, FHC_INTEGER, false). "
+				AND pr.projektphase_id=".$this->db_add_param($projektphase_id, FHC_INTEGER, false).';';
 		if($this->db_query($qry))
 			return true;
 		else
diff --git a/soap/ressource_projekt.soap.php b/soap/ressource_projekt.soap.php
index 065568269..1a9f9b426 100644
--- a/soap/ressource_projekt.soap.php
+++ b/soap/ressource_projekt.soap.php
@@ -105,7 +105,7 @@ function deleteProjektRessource($username, $passwort, $projektRessource)
     if($projektRessource->projektphase_id != '')
     {
         // von Projektphase löschen
-        if($ressource->deleteFromPhase($projektRessource->ressource_id, $projektRessource->projektphase_id))
+        if($ressource->deleteFromPhaseWithProjektRessourceId($projektRessource->ressource_id, $projektRessource->projektphase_id, $projektRessource->projekt_ressource_id))
             return "Erfolg";
         else
             return "Fehler beim Löschen";