appdb/include maintainer.php version.php
WineHQ
wineowner at wine.codeweavers.com
Sat Mar 17 14:39:30 CDT 2007
ChangeSet ID: 30980
CVSROOT: /opt/cvs-commit
Module name: appdb
Changes by: wineowner at winehq.org 2007/03/17 14:39:29
Modified files:
include : maintainer.php version.php
Log message:
Alexander Nicolaysen Sørnes <alex at thehandofagony.com>
Show links in maintainer processing form
Patch: http://cvs.winehq.org/patch.py?id=30980
Old revision New revision Changes Path
1.31 1.32 +31 -48 appdb/include/maintainer.php
1.106 1.107 +9 -0 appdb/include/version.php
Index: appdb/include/maintainer.php
diff -u -p appdb/include/maintainer.php:1.31 appdb/include/maintainer.php:1.32
--- appdb/include/maintainer.php:1.31 17 Mar 2007 19:39:29 -0000
+++ appdb/include/maintainer.php 17 Mar 2007 19:39:29 -0000
@@ -479,58 +479,49 @@ class maintainer
*/
echo '<tr valign=top><td class=color0 style=\'text-align:right\'><b>Other maintainers of this app:</b></td>',"\n";
- $bFoundMaintainers = false;
+ /* Fetch maintainers and super maintainers */
+ $oVersion = new Version($this->iVersionId);
+ $aOtherMaintainers = $oVersion->getMaintainersUserIds();
+ $aOtherSuperMaintainers =
+ Maintainer::getSuperMaintainersUserIdsFromAppId($this->iAppId);
- $bFirstDisplay = true; /* if false we need to fix up table rows appropriately */
+ if($aOtherMaintainers || $aOtherSuperMaintainers)
+ $bFoundMaintainers = true;
+ else
+ $bFoundMaintainers = false;
+ echo "<td>\n";
/* display maintainers for the version */
- $oVersion = new Version($this->iVersionId);
- $aOtherUsers = $oVersion->getMaintainersUserIds();
- if($aOtherUsers)
+ if($aOtherMaintainers)
{
- $bFoundMaintainers = true;
- while(list($index, $iUserId) = each($aOtherUsers))
+ while(list($index, $iUserId) = each($aOtherMaintainers))
{
$oUser = new User($iUserId);
- if($bFirstDisplay)
- {
- echo "<td>".$oUser->sRealname."</td></tr>\n";
- $bFirstDisplay = false;
- } else
- {
- echo "<tr><td class=\"color0\"></td><td>".$oUser->sRealname."</td></tr>\n";
- }
+ echo "$oUser->sRealname<br />\n";
}
}
/* display super maintainers for the given app */
- $aOtherUsers = Maintainer::getSuperMaintainersUserIdsFromAppId($this->iAppId);
- if($aOtherUsers)
+
+ if($aOtherSuperMaintainers)
{
- $bFoundMaintainers = true;
- while(list($index, $iUserId) = each($aOtherUsers))
+ while(list($index, $iUserId) = each($aOtherSuperMaintainers))
{
$oUser = new User($iUserId);
- if($bFirstDisplay)
- {
- echo "<td>".$oUser->sRealname."*</td></tr>\n";
- $bFirstDisplay = false;
- } else
- {
- echo "<tr><td class=\"color0\"></td><td>".$oUser->sRealname."*</td></tr>\n";
- }
+ echo "$oUser->sRealname*<br />\n";
}
}
if(!$bFoundMaintainers)
{
- echo "<td>No other maintainers</td></tr>\n";
+ echo "No other maintainers";
}
+ echo "</td></tr>\n";
+
// Show which other apps the user maintains
- echo '<tr valign="top"><td class="color0" style=\'text-align:right\'><b>This user also maintains these apps:</b></td>',"\n";
+ echo '<tr valign="top"><td class="color0" style=\'text-align:right\'><b>This user also maintains these apps:</b></td><td>',"\n";
- $bFirstDisplay = true;
$oUser = new User($this->iUserId);
$aOtherApps = Maintainer::getAppsMaintained($oUser);
if($aOtherApps)
@@ -538,37 +529,29 @@ class maintainer
while(list($index, list($iAppIdOther, $iVersionIdOther, $bSuperMaintainerOther)) = each($aOtherApps))
{
$oApp = new Application($iAppIdOther);
- $oVersion = new Version($iVersionIdOther);
- if($bFirstDisplay)
- {
- $bFirstDisplay = false;
- if($bSuperMaintainerOther)
- echo "<td>".$oApp->sName."*</td></tr>\n";
- else
- echo "<td>".$oApp->sName." ".$oVersion->sName."</td></tr>\n";
- } else
- {
- if($bSuperMaintainerOther)
- echo "<td class=color0></td><td>".$oApp->sName."*</td></tr>\n";
- else
- echo "<td class=color0></td><td>".$oApp->sName." ".$oVersion->sName."</td></tr>\n";
- }
+
+ if($bSuperMaintainerOther)
+ echo $oApp->objectMakeLink()."*<br />\n";
+ else
+ echo $oVersion->fullNameLink($iVersionIdOther)."<br />\n";
}
} else
{
- echo "<td>User maintains no other applications</td></tr>\n";
+ echo "User maintains no other applications";
}
+ echo "</td></tr>\n";
+
$oApp = new Application($this->iAppId);
$oVersion = new Version($this->iVersionId);
//app name
echo '<tr valign=top><td class=color0 style=\'text-align:right\'><b>App Name:</b></td>',"\n";
- echo "<td>".$oApp->sName."</td></tr>\n";
+ echo "<td>".$oApp->objectMakeLink()."</td></tr>\n";
//version
echo '<tr valign=top><td class=color0 style=\'text-align:right\'><b>App Version:</b></td>',"\n";
- echo "<td>".$oVersion->sName."</td></tr>\n";
+ echo "<td>".$oVersion->objectMakeLink()."</td></tr>\n";
//maintainReason
echo '<tr valign=top><td class=color0 style=\'text-align:right\'><b>Maintainer request reason:</b></td>',"\n";
Index: appdb/include/version.php
diff -u -p appdb/include/version.php:1.106 appdb/include/version.php:1.107
--- appdb/include/version.php:1.106 17 Mar 2007 19:39:29 -0000
+++ appdb/include/version.php 17 Mar 2007 19:39:29 -0000
@@ -956,6 +956,15 @@ class Version {
return "$oRow->appName $oRow->versionName";
}
+ /* Creates a link to the version labelled with the full application name */
+ function fullNameLink($iVersionId)
+ {
+ $oVersion = new version($iVersionId);
+ $sLink = "<a href=\"".$oVersion->objectMakeUrl()."\">".
+ $oVersion->fullName($iVersionId)."</a>";
+ return $sLink;
+ }
+
function showList($hResult)
{
//show applist
More information about the wine-cvs
mailing list