claunia/qemudb
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Allow moving test results to a different version

Browse Source
This commit is contained in:
Alexander Nicolaysen Sørnes
2009-04-24 21:24:30 +02:00
committed by Alexander Nicolaysen Sørnes
parent 1e1f1c971b
commit 5560eaaba3
2 changed files with 50 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
include/objectManager.php
View File

@@ -923,7 +923,30 @@ class ObjectManager
"color4"); "color4");
$oParent = $oObject->objectGetParent(); $oParent = $oObject->objectGetParent();
$oGrandFather = $oParent->objectGetParent();
if($oGrandFather)
{
$aParentSiblings = $oGrandFather->objectGetChildrenClassSpecific(get_class($oParent));
echo "Children of " . $oGrandFather->objectMakeLink() . " <br />";
$i = 0;
foreach($aParentSiblings as $oCandidate)
{
if($oCandidate->objectGetState() != 'accepted')
continue;
if($oCandidate->objectGetId() == $oParent->objectGetId())
continue;
echo html_tr(array($oCandidate->objectMakeLink(),
"<a href=\"".$this->makeUrl('changeParent', $this->iId). "&amp;iNewId=".$oCandidate->objectGetId()."\">Move here</a>"),
($i % 2) ? "color0" : "color1");
$i++;
}
} else
{
/* We only allow moving to non-queued objects */ /* We only allow moving to non-queued objects */
if(!$hResult = $oParent->objectGetEntries('accepted')) if(!$hResult = $oParent->objectGetEntries('accepted'))
{ {
@@ -947,6 +970,7 @@ class ObjectManager
"&amp;iNewId=".$oCandidate->objectGetId()."\">Move here</a>"), "&amp;iNewId=".$oCandidate->objectGetId()."\">Move here</a>"),
($i % 2) ? "color0" : "color1"); ($i % 2) ? "color0" : "color1");
} }
}
echo "</table>\n"; echo "</table>\n";
@@ -1113,7 +1137,7 @@ class ObjectManager
exit; exit;
} }
private function displayChangeParent($oObject) private function displayChangeParent($oObject, $sLinkText = 'Move to another parent entry')
{ {
/* Display a link to the move child objects page if the class has the necessary /* Display a link to the move child objects page if the class has the necessary
functions and the user has edit rights. Not all classes have child objects. */ functions and the user has edit rights. Not all classes have child objects. */
@@ -1121,7 +1145,7 @@ class ObjectManager
method_exists($oObject, "objectGetId") && $oObject->canEdit()) method_exists($oObject, "objectGetId") && $oObject->canEdit())
{ {
echo "<a href=\"".$this->makeUrl("showChangeParent", $this->iId, echo "<a href=\"".$this->makeUrl("showChangeParent", $this->iId,
"Move to another parent entry")."\">Move to another parent entry</a>\n"; "Move to another parent entry")."\">$sLinkText</a>\n";
} }
} }

10
include/testData.php
View File

@@ -621,6 +621,7 @@ class testData{
$oTableRow->AddTextCell('<a href="'.$oObject->makeUrl('edit', $this->iTestingId, $oTableRow->AddTextCell('<a href="'.$oObject->makeUrl('edit', $this->iTestingId,
'Edit Test Results').'&amp;sReturnTo='.urlencode($_SERVER['REQUEST_URI']).'">'. 'Edit Test Results').'&amp;sReturnTo='.urlencode($_SERVER['REQUEST_URI']).'">'.
'Edit</a> &nbsp; '."\n". 'Edit</a> &nbsp; '."\n".
'<a href="'.$oObject->makeUrl('showChangeParent', $this->iTestingId, 'Move test report to another version').'&amp;sReturnTo='.urlencode($_SERVER['REQUEST_URI']).'">Move</a>'."\n".
'<a href="'.$oObject->makeUrl('delete', $this->iTestingId, 'Delete+Test+Results'). '<a href="'.$oObject->makeUrl('delete', $this->iTestingId, 'Delete+Test+Results').
'&amp;sReturnTo='.urlencode($_SERVER['REQUEST_URI']).'">Delete</a></td>'."\n"); '&amp;sReturnTo='.urlencode($_SERVER['REQUEST_URI']).'">Delete</a></td>'."\n");
} }
@@ -1400,8 +1401,8 @@ class testData{
function objectMakeLink() function objectMakeLink()
{ {
/* STUB */ $oObject = new objectManager("testData", "Edit Test Results", $this->iTestingId);
return TRUE; return '<a href="'.$oObject->makeUrl("edit", $this->iTestingId).'">test report</a>';
} }
public function isOld() public function isOld()
@@ -1413,6 +1414,11 @@ class testData{
return ((mktime() - mysqltimestamp_to_unixtimestamp($this->sSubmitTime)) > (60 * 60 * 24 * 175)); return ((mktime() - mysqltimestamp_to_unixtimestamp($this->sSubmitTime)) > (60 * 60 * 24 * 175));
} }
public function objectSetParent($iNewId, $sClass = 'version')
{
$this->iVersionId = $iNewId;
}
function objectGetParent() function objectGetParent()
{ {
return new version($this->iVersionId); return new version($this->iVersionId);