Alexander Nicolaysen Sørnes <alex@thehandofagony.com>
Let objectManager handle deletion and delete notification.
This commit is contained in:
@@ -209,7 +209,7 @@ class testData{
|
||||
}
|
||||
|
||||
// Delete test results.
|
||||
function delete($bSilent=false)
|
||||
function delete()
|
||||
{
|
||||
// is the current user allowed to delete this test result?
|
||||
$oVersion = new Version($this->iVersionId);
|
||||
@@ -230,12 +230,6 @@ class testData{
|
||||
return false;
|
||||
}
|
||||
|
||||
if(!$bSilent)
|
||||
$this->SendNotificationMail("delete");
|
||||
|
||||
if($this->iSubmitterId && ($this->iSubmitterId != $_SESSION['current']->iUserId))
|
||||
$this->mailSubmitter("delete");
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -314,6 +308,60 @@ class testData{
|
||||
}
|
||||
}
|
||||
|
||||
function objectGetMailOptions($sAction, $bMailSubmitter, $bParentAction)
|
||||
{
|
||||
$oOptions = new mailOptions();
|
||||
|
||||
if($sAction == "delete" && $bParentAction)
|
||||
$oOptions->bMailOnce = TRUE;
|
||||
|
||||
return $oOptions;
|
||||
}
|
||||
|
||||
function objectGetMail($sAction, $bMailSubmitter, $bParentAction)
|
||||
{
|
||||
$oSubmitter = new User($this->iSubmitterId);
|
||||
$sName = version::fullName($this->iVersionId);
|
||||
|
||||
$sMsg = null;
|
||||
$sSubject = null;
|
||||
|
||||
if($bMailSubmitter)
|
||||
{
|
||||
switch($sAction)
|
||||
{
|
||||
case "delete":
|
||||
$sSubject = "Submitted test data deleted";
|
||||
if($bParentAction)
|
||||
{
|
||||
$sMsg = "All test data you submitted for '$sName' has ".
|
||||
"been deleted because '$sName' was deleted.";
|
||||
} else
|
||||
{
|
||||
$sMsg = "The test report you submitted for '$sName' has ".
|
||||
"been deleted.";
|
||||
}
|
||||
break;
|
||||
}
|
||||
$aMailTo = nulL;
|
||||
} else
|
||||
{
|
||||
switch($sAction)
|
||||
{
|
||||
case "delete":
|
||||
if(!$bParentAction)
|
||||
{
|
||||
$sSubject = "Test Results deleted for $sName by ".
|
||||
$_SESSION['current']->sRealname;
|
||||
$sMsg = "";
|
||||
}
|
||||
break;
|
||||
}
|
||||
$aMailTo = User::get_notify_email_address_list(null, $this->iVersionId);
|
||||
}
|
||||
return array($sSubject, $sMsg, $aMailTo);
|
||||
}
|
||||
|
||||
function mailSubmitter($sAction="add")
|
||||
{
|
||||
global $aClean;
|
||||
@@ -343,12 +391,6 @@ class testData{
|
||||
$sMsg .= $this->objectMakeUrl()."\n";
|
||||
$sMsg .= "Reason given:\n";
|
||||
break;
|
||||
case "delete":
|
||||
$sSubject = "Submitted testing data deleted";
|
||||
$sMsg = "The testing data you submitted for '$sName' has ".
|
||||
"been deleted by ".$_SESSION['current']->sRealname.".";
|
||||
$sMsg .= "Reason given:\n";
|
||||
break;
|
||||
}
|
||||
$sMsg .= $aClean['sReplyText']."\n";
|
||||
$sMsg .= "We appreciate your help in making the Application ".
|
||||
@@ -400,17 +442,6 @@ class testData{
|
||||
$sMsg .= $sBacklink;
|
||||
addmsg("test data modified.", "green");
|
||||
break;
|
||||
case "delete":
|
||||
$sSubject = "Test Results deleted for version ".$oVersion->sName." of ".$oApp->sName." by ".$_SESSION['current']->sRealname;
|
||||
// if replyText is set we should report the reason the data was deleted
|
||||
if($aClean['sReplyText'])
|
||||
{
|
||||
$sMsg .= "Reason given:\n";
|
||||
$sMsg .= $aClean['sReplyText']."\n"; // append the reply text, if there is any
|
||||
}
|
||||
|
||||
addmsg("test data deleted.", "green");
|
||||
break;
|
||||
case "reject":
|
||||
$sSubject = "Test Results rejected for version ".$oVersion->sName." of ".$oApp->sName." by ".$_SESSION['current']->sRealname;
|
||||
$sMsg .= $sBacklink;
|
||||
@@ -1140,6 +1171,11 @@ class testData{
|
||||
{
|
||||
return $this->iTestingId;
|
||||
}
|
||||
|
||||
function objectGetSubmitterId()
|
||||
{
|
||||
return $this->iSubmitterId;
|
||||
}
|
||||
}
|
||||
|
||||
?>
|
||||
|
||||
Reference in New Issue
Block a user