Move getMaintainersUserIds...() to version::getMaintainersUserIds() and fixup callers of this function
This commit is contained in:
@@ -68,7 +68,8 @@ if ($aClean['sSub'])
|
||||
|
||||
$firstDisplay = true; /* if false we need to fix up table rows appropriately */
|
||||
|
||||
$other_users = getMaintainersUserIdsFromAppIdVersionId($oRow->versionId);
|
||||
$oVersion = new Version($oRow->versionId);
|
||||
$other_users = $oVersion->getMaintainersUserIds();
|
||||
if($other_users)
|
||||
{
|
||||
$foundMaintainers = true;
|
||||
|
||||
@@ -3,30 +3,6 @@
|
||||
/* functions for maintainers */
|
||||
/*****************************/
|
||||
|
||||
/*
|
||||
* get the userIds of maintainers for a versionId
|
||||
*/
|
||||
function getMaintainersUserIdsFromAppIdVersionId($versionId)
|
||||
{
|
||||
$retval = array();
|
||||
|
||||
/* early out if the versionId isn't valid */
|
||||
if($versionId == 0)
|
||||
return $retval;
|
||||
|
||||
$sQuery = "SELECT userId FROM ".
|
||||
"appMaintainers WHERE versionId = '?';";
|
||||
$hResult = query_parameters($sQuery, $versionId);
|
||||
$c = 0;
|
||||
while($oRow = mysql_fetch_object($hResult))
|
||||
{
|
||||
$retval[$c] = $oRow->userId;
|
||||
$c++;
|
||||
}
|
||||
|
||||
return $retval;
|
||||
}
|
||||
|
||||
/*
|
||||
* get the userIds of super maintainers for this appId
|
||||
*/
|
||||
|
||||
@@ -32,7 +32,7 @@ class Version {
|
||||
var $aTestingIds; // an array that contains the testingId of every test result linked to this version
|
||||
var $aMonitorIds; // an array that contains the monitorId of every monitor linked to this version
|
||||
|
||||
/**
|
||||
/**
|
||||
* constructor, fetches the data.
|
||||
*/
|
||||
function Version($iVersionId = null)
|
||||
@@ -677,7 +677,7 @@ class Version {
|
||||
// display all maintainers of this application
|
||||
echo "<tr class=\"color0\"><td align=\"left\" colspan=\"2\"><b>Maintainers of this version:</b>\n";
|
||||
echo "<table width=\"250\" border=\"0\">";
|
||||
$aMaintainers = getMaintainersUserIdsFromAppIdVersionId($this->iVersionId);
|
||||
$aMaintainers = $this->getMaintainersUserIds();
|
||||
$aSupermaintainers = getSuperMaintainersUserIdsFromAppId($this->iAppId);
|
||||
$aAllMaintainers = array_merge($aMaintainers,$aSupermaintainers);
|
||||
$aAllMaintainers = array_unique($aAllMaintainers);
|
||||
@@ -926,6 +926,28 @@ class Version {
|
||||
echo html_frame_end("Click the Version Name to view the details of that Version");
|
||||
}
|
||||
}
|
||||
|
||||
/* returns the maintainers of this version in an array */
|
||||
function getMaintainersUserIds()
|
||||
{
|
||||
$aMaintainers = array();
|
||||
|
||||
/* early out if the versionId isn't valid */
|
||||
if($this->iVersionId == 0)
|
||||
return $aMaintainers;
|
||||
|
||||
$sQuery = "SELECT userId FROM ".
|
||||
"appMaintainers WHERE versionId = '?';";
|
||||
$hResult = query_parameters($sQuery, $this->iVersionId);
|
||||
$iCount = 0;
|
||||
while($oRow = mysql_fetch_object($hResult))
|
||||
{
|
||||
$aMaintainers[$iCount] = $oRow->userId;
|
||||
$iCount++;
|
||||
}
|
||||
|
||||
return $aMaintainers;
|
||||
}
|
||||
}
|
||||
|
||||
?>
|
||||
|
||||
Reference in New Issue
Block a user