ChangeSet ID: 31113
CVSROOT: /opt/cvs-commit
Module name: appdb
Changes by: wineowner(a)winehq.org 2007/04/27 18:22:37
Modified files:
include : distribution.php
Log message:
Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com>
Allow maintainers to submit un-queued distributions.They are allowed to submit un-queued
testData for the versions they maintain, so without this change they submit un-queued test
results associated with a queued distribution. This doesn't make any sense since the
testData would be active but the distribution queued. It's cleaner to just let maintainers
unqueue distributions for versions they maintain.
Patch: http://cvs.winehq.org/patch.py?id=31113
Old revision New revision Changes Path
1.26 1.27 +16 -9 appdb/include/distribution.php
Index: appdb/include/distribution.php
diff -u -p appdb/include/distribution.php:1.26 appdb/include/distribution.php:1.27
--- appdb/include/distribution.php:1.26 27 Apr 2007 23:22:37 -0000
+++ appdb/include/distribution.php 27 Apr 2007 23:22:37 -0000
@@ -135,9 +135,11 @@ class distribution {
// Delete Distributution.
function delete($bSilent=false)
{
- // is the current user allowed to delete this Distribution?
- if(!$_SESSION['current']->hasPriv("admin") &&
- !($_SESSION['current']->iUserId == $this->iSubmitterId))
+ /* Is the current user allowed to delete this distribution? We allow
+ everyone to delete a queued, empty distribution, because it should be
+ deleted along with the last testData associated with it */
+ if(!($this->canEdit() || (!sizeof($this->aTestingIds) &&
+ $this->sQueued != "false")))
return;
/* Check for associated test results */
@@ -168,11 +170,9 @@ class distribution {
// Move Distribution out of the queue.
function unQueue()
{
- // is the current user allowed to move this Distribution?
- if(!$_SESSION['current']->hasPriv("admin"))
- {
- return false;
- }
+ /* Check permissions */
+ if($this->mustBeQueued())
+ return FALSE;
// If we are not in the queue, we can't move the Distribution out of the queue.
if(!$this->sQueued == 'true')
@@ -481,12 +481,19 @@ class distribution {
if($_SESSION['current']->hasPriv("admin"))
return TRUE;
+ /* Maintainers are allowed to process queued test results and therefore also
+ queued distributions */
+ if(is_object($this) && $this->sQueued != "false" &&
+ maintainer::isUserMaintainer($_SESSION['current']))
+ return TRUE;
+
return FALSE;
}
function mustBeQueued()
{
- if($_SESSION['current']->hasPriv("admin"))
+ if($_SESSION['current']->hasPriv("admin") ||
+ maintainer::isUserMaintainer($_SESSION['current']))
return FALSE;
else
return TRUE;
ChangeSet ID: 31110
CVSROOT: /opt/cvs-commit
Module name: lostwages
Changes by: julliard(a)winehq.org 2007/04/27 10:08:52
Modified files:
include : winehq.conf
Added files:
news : 2007042701.xml
Log message:
Release 0.9.36
Patch: http://cvs.winehq.org/patch.py?id=31110
Old revision New revision Changes Path
1.58 1.59 +1 -1 lostwages/include/winehq.conf
Added 1.1 +0 -0 lostwages/news/2007042701.xml
Index: lostwages/include/winehq.conf
diff -u -p lostwages/include/winehq.conf:1.58 lostwages/include/winehq.conf:1.59
--- lostwages/include/winehq.conf:1.58 27 Apr 2007 15: 8:52 -0000
+++ lostwages/include/winehq.conf 27 Apr 2007 15: 8:52 -0000
@@ -29,7 +29,7 @@ news_xml_path: news
wwn_xml_path: wwn
# Snapshot Date
-snapshot_date: 0.9.35
+snapshot_date: 0.9.36
# Current RH Packages Snapshot Date
snapshot_date_rh: 0.9.2
Index: lostwages/news/2007042701.xml
diff -u -p /dev/null lostwages/news/2007042701.xml:1.1
--- /dev/null 27 Apr 2007 15: 8:52 -0000
+++ lostwages/news/2007042701.xml 27 Apr 2007 15: 8:52 -0000
@@ -0,0 +1,26 @@
+<news>
+<date>April 27, 2007</date>
+<title>Wine 0.9.36 Released</title>
+<body>
+<p>Wine 0.9.36 was released today, with the following main changes:</p>
+
+<ul>
+<li>Midi support in the CoreAudio driver.</li>
+<li>Mixer support in the Alsa driver.</li>
+<li>A lot of MSI fixes.</li>
+<li>Implementation for most D3DRM functions.</li>
+<li>The usual assortment of Direct3D fixes.</li>
+<li>Lots of bug fixes.</li>
+</ul>
+
+<p>
+Binary packages are in the process of being built and it may take a
+few days for them to appear, but the source is
+<a href="http://prdownloads.sourceforge.net/wine/wine-0.9.36.tar.bz2">available now</a>.
+You can find out more about this release in the
+<a href="?announce=0.9.36">announcement</a>. Check out our
+<a href="/site/download">download page</a> for packages for your
+distribution.
+</p>
+</body>
+</news>