Hi, Am Sonntag, den 19.05.2013, 11:22 +0800 schrieb Paul Wise: > Control: user qa.debian.org@packages.debian.org > Control: usertags -1 + ddpo > > On Sun, May 19, 2013 at 6:01 AM, Joachim Breitner wrote: > > > As always: Please indicate if you agree with the bug even if you don’t > > implement it right away, as it would encourage patches. > > I expect this would be a popular feature. I would suggest making it an > option rather than the default though. I worked a bit on the page; see the attached patches (which make minor other adjustments as well). I did not yet add an option to show comaintained packages in a separate table. Would that be desirable? Greetings, Joachim -- Joachim "nomeata" Breitner Debian Developer nomeata@debian.org | ICQ# 74513189 | GPG-Keyid: 4743206C JID: nomeata@joachim-breitner.de | http://people.debian.org/~nomeata
From 402789ffca148355929014b281cfca6d54dd29b1 Mon Sep 17 00:00:00 2001
From: Joachim Breitner <mail@joachim-breitner.de>
Date: Sun, 19 May 2013 12:32:36 +0200
Subject: [PATCH 1/4] Mention whether we are showing Co-maintained packages or
not
---
wml/developer.wml | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/wml/developer.wml b/wml/developer.wml
index 69b68f2..ec6bc25 100644
--- a/wml/developer.wml
+++ b/wml/developer.wml
@@ -179,7 +179,14 @@ function print_header_entries_body($comaint, $login, $name)
return;
$ulogin = urlencode($login);
- $maintainer_data = "Maintainer: <b>$name <$login></b> -- Bugs: " .
+ if (!strcmp($comaint, "no")) {
+ $maintainer_data = "Maintainer:";
+ } else if (!strcmp($comaint, "only")) {
+ $maintainer_data = "Co-Maintainer:";
+ } else {
+ $maintainer_data = "Maintainer and Co-Maintainer:";
+ }
+ $maintainer_data = $maintainer_data . " <b>$name <$login></b> -- Bugs: " .
html_a("open", "http://bugs.debian.org/cgi-bin/pkgreport.cgi?which=maint&data=$ulogin&archive=no&raw=yes&bug-rev=yes&pend-exc=fixed&pend-exc=done";) . " - " .
html_a("RC", "http://bugs.debian.org/cgi-bin/pkgreport.cgi?which=maint&data=$ulogin&archive=no&pend-exc=done&sev-inc=critical&sev-inc=grave&sev-inc=serious";) . " - " .
html_a("all", "http://bugs.debian.org/cgi-bin/pkgreport.cgi?maint=$ulogin";) . " - " .
--
1.8.3.rc2
From 3b670a3c2a6eef79a0414a2f1a09f47e4fb61158 Mon Sep 17 00:00:00 2001
From: Joachim Breitner <mail@joachim-breitner.de>
Date: Sun, 19 May 2013 20:16:09 +0200
Subject: [PATCH 2/4] Add footer like on the PTS
which makes it easer for contributors to find the code.
---
wml/common-html.php | 1 +
1 file changed, 1 insertion(+)
diff --git a/wml/common-html.php b/wml/common-html.php
index 615bfda..85838ff 100644
--- a/wml/common-html.php
+++ b/wml/common-html.php
@@ -51,6 +51,7 @@ function print_footer()
list($micro,$sec) = explode(' ', microtime());
list($smicro,$ssec) = explode(' ', $time);
$footer .= sprintf("Time needed to generate page: %.2fs", $sec-$ssec+$micro-$smicro) . html_br();
+ $footer .= '<a href="svn://svn.debian.org/svn/qa/trunk/wml">Checkout SVN repository</a> | <a href="http://anonscm.debian.org/viewvc/qa/trunk/wml/";>Browse SVN repository</a> | ';
$footer .= "Report problems with DDPO to the ". html_a("qa.debian.org pseudopackage", "http://bugs.debian.org/cgi-bin/pkgreport.cgi?pkg=qa.debian.org";) .".";
print html_p(html_small($footer));
--
1.8.3.rc2
From c7121c64b0c5ecc85cdfaf429f74b0880ce419c3 Mon Sep 17 00:00:00 2001
From: Joachim Breitner <mail@joachim-breitner.de>
Date: Sun, 19 May 2013 20:32:26 +0200
Subject: [PATCH 3/4] Do not make setting collapsable
as they are at the bottom of the page anyways; this increases the chance
that the users actually find these.
---
wml/developer.wml | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/wml/developer.wml b/wml/developer.wml
index ec6bc25..8fe510c 100644
--- a/wml/developer.wml
+++ b/wml/developer.wml
@@ -220,7 +220,6 @@ function print_header_entries_top($login, $name)
function print_help() {
$counter_span = 0;
- $counter_span += 1;
$display_data = html_b(html_em("You need to allow cookies if you want the configuration to be stored. If not, remember/bookmark the right URL that will be provided after submitting changes. "));
$display_data .= "You can override the settings by providing an extra arg to the URL (e.g. &buildd=1 if you want to display the buildd column). These args will not change the custom settings you defined before (the cookie is not modified)." . html_br();
$display_data .= "The 'Name' ordering sorts by package name, 'Date' sorts by upload date (descending), 'N./D.' sorts by name for main/contrib/non-free packages and by date for other sections, 'Section' sorts by sections first and by name secondly." . html_br();
@@ -267,7 +266,7 @@ function print_help() {
$display_data .= html_form("developer.php", "GET", $preamble, "", "Show all");
$title = html_b("Display configuration:");
- print html_br() . html_collexp($counter_span, $title, "general", true, $display_data);
+ print html_span($title) . html_div($display_data);
$counter_span += 1;
$help_data = "The description of the package is available as mouseover title from the package name. An asterisk (*) indicates the presence of co-maintainers (Uploaders: control field)" . html_br();
@@ -314,7 +313,7 @@ function print_help() {
$help_data = html_small($help_data);
$title = html_b("Help");
- print html_collexp($counter_span, $title, "general", true, $help_data);
+ print html_br() . html_collexp($counter_span, $title, "general", true, $help_data);
}
--
1.8.3.rc2
From 2226c1613307fc8b0dbb7af013890502623ef71d Mon Sep 17 00:00:00 2001
From: Joachim Breitner <mail@joachim-breitner.de>
Date: Sun, 19 May 2013 20:52:31 +0200
Subject: [PATCH 4/4] Treat the comaint option like any of the other options
So when nothing is set explicitly, the cookie value is used, and the
current setting can be checked and set via the settings form at the end.
Also simplifies the code a bit.
---
wml/common-html.php | 6 ++-
wml/developer.wml | 116 ++++++++++++++++++++++++++--------------------------
2 files changed, 63 insertions(+), 59 deletions(-)
diff --git a/wml/common-html.php b/wml/common-html.php
index 85838ff..54df767 100644
--- a/wml/common-html.php
+++ b/wml/common-html.php
@@ -430,6 +430,10 @@ function checkbox($value)
$data .= html_input_radio($value,1,$arg_cookie[$value] == 1,"Date (1)\n") . html_br();
$data .= html_input_radio($value,2,$arg_cookie[$value] == 2,"N./D. (2)\n") . html_br();
$data .= html_input_radio($value,3,$arg_cookie[$value] == 3,"Section (3)\n") . html_br();
+ } elseif ($value == 'comaint') {
+ $data = html_input_radio($value,"yes",!strcmp($arg_cookie[$value],"yes"),"yes\n") . html_br();
+ $data .= html_input_radio($value,"no",!strcmp($arg_cookie[$value],"no"),"no\n") . html_br();
+ $data .= html_input_radio($value,"only",!strcmp($arg_cookie[$value],"only"),"only\n") . html_br();
}
$data = html_color($data,"green");
return $data;
@@ -444,7 +448,7 @@ function setaction()
$action = "";
foreach(array_keys($_GET) as $key)
{
- if (($key == 'login') or ($key == 'package') or ($key == 'gpg_key') or ($key == 'comaint'))
+ if (($key == 'login') or ($key == 'package') or ($key == 'gpg_key'))
{
$action .= html_input_hidden($key,$_GET[$key]);
}
diff --git a/wml/developer.wml b/wml/developer.wml
index 8fe510c..0681356 100644
--- a/wml/developer.wml
+++ b/wml/developer.wml
@@ -77,7 +77,8 @@ if (!empty($_COOKIE['columnsinfo']) and ($_GET['reset'] != 'yes'))
}
/* Set missing parts of the cookies */
-$arg_cookie_def = array ( bugs => 3,
+$arg_cookie_def = array ( comaint => "yes",
+ bugs => 3,
version => 1,
ubuntu => 1,
excuses => 1,
@@ -110,17 +111,22 @@ if($_GET['reset'] != 'yes')
{
foreach(array_keys($_GET) as $key)
{
- if (($key == 'comaint') or ($key == 'login') or ($key == 'package') or ($key == 'wnpp') or ($key == 'gpg_key') or ($key == 'popcon'))
+ if (($key == 'login') or ($key == 'package') or ($key == 'wnpp') or ($key == 'gpg_key') or ($key == 'popcon'))
{
continue;
} elseif (!strcmp($_GET[$key], "") or preg_match($filter_re, $_GET[$key])) {
$arg_cookie[$key] = $_GET[$key];
}
}
+
+ /* Saniztize some values */
+ if (! preg_match($comaint_re, $arg_cookie['comaint'])) {
+ $arg_cookie['comaint'] = "yes";
+ }
+
if ($_GET['set'] == 'yes') setcookie('columnsinfo', base64_encode(serialize($arg_cookie)), strtotime('+3 month'));
}
-
function start_output ()
{
global $called_start_output;
@@ -173,15 +179,15 @@ function printBackLink($arg = "") {
}
/* function used to display the main maintainer links in a collapsable area */
-function print_header_entries_body($comaint, $login, $name)
+function print_header_entries_body($login, $name)
{
if (!$login) /* $login is empty for tasks */
return;
$ulogin = urlencode($login);
- if (!strcmp($comaint, "no")) {
+ if (!strcmp(isdisplayed('comaint'), "no")) {
$maintainer_data = "Maintainer:";
- } else if (!strcmp($comaint, "only")) {
+ } else if (!strcmp(isdisplayed('comaint'), "only")) {
$maintainer_data = "Co-Maintainer:";
} else {
$maintainer_data = "Maintainer and Co-Maintainer:";
@@ -196,7 +202,7 @@ function print_header_entries_body($comaint, $login, $name)
$initial = substr($login, 0, 1);
$maintainer_data .= "Reports: " .
html_a("Dashboard", "http://udd.debian.org/dmd.cgi?email=$ulogin";) . " - " .
- html_a("Buildd", "https://buildd.debian.org/status/package.php?p=$ulogin&comaint=$comaint";) . " - " .
+ html_a("Buildd", "https://buildd.debian.org/status/package.php?p=$ulogin&comaint="; . isdisplayed('comaint')) . " - " .
html_a("Lintian", "http://lintian.debian.org/reports/maintainer/$ulogin.html";) . " - " .
// down since 2006-11 - html_a("Checklib", "http://rerun.lefant.net/checklib/maintainers.$initial.html#$ulogin";) . " - " .
html_a("Debtags", "http://debtags.debian.net/reports/maint/$login";) . " - " . // enrico says no encoding is ok
@@ -224,7 +230,8 @@ function print_help() {
$display_data .= "You can override the settings by providing an extra arg to the URL (e.g. &buildd=1 if you want to display the buildd column). These args will not change the custom settings you defined before (the cookie is not modified)." . html_br();
$display_data .= "The 'Name' ordering sorts by package name, 'Date' sorts by upload date (descending), 'N./D.' sorts by name for main/contrib/non-free packages and by date for other sections, 'Section' sorts by sections first and by name secondly." . html_br();
$display_data = html_small($display_data);
- $display_table_th = html_th("Bugs","&bugs=");
+ $display_table_th = html_th("Co-Maintained","&comaint=");
+ $display_table_th .= html_th("Bugs","&bugs=");
$display_table_th .= html_th("Version","&version=");
$display_table_th .= html_th("Ubuntu","&ubuntu=");
$display_table_th .= html_th("Excuses","&excuses=");
@@ -238,7 +245,8 @@ function print_help() {
$display_table_th .= html_th("Ordering","&ordering=");
$display_table_th .= html_th("Uploads","&uploads=");
- $display_table_tds = html_td(checkbox('bugs'));
+ $display_table_tds = html_td(checkbox('comaint'));
+ $display_table_tds .= html_td(checkbox('bugs'));
$display_table_tds .= html_td(checkbox('version'));
$display_table_tds .= html_td(checkbox('ubuntu'));
$display_table_tds .= html_td(checkbox('excuses'));
@@ -1052,7 +1060,7 @@ function print_package_entry($package, $uploader, $back_tr_color, $skip_seen)
This function prints a package table information for specific branch
given in argument
*/
-function print_package_entries($branch, $packages, $comaint, $skip_seen)
+function print_package_entries($branch, $packages, $skip_seen)
{
global $uploads_db;
global $dist2release;
@@ -1087,8 +1095,8 @@ function print_package_entries($branch, $packages, $comaint, $skip_seen)
$trs = array();
foreach($pack_array as $package)
{
- if (($uploader_array[$package] && !strcmp($comaint, "no")) ||
- (!$uploader_array[$package] && !strcmp($comaint, "only"))) continue;
+ if (($uploader_array[$package] && !strcmp(isdisplayed("comaint"), "no")) ||
+ (!$uploader_array[$package] && !strcmp(isdisplayed("comaint"), "only"))) continue;
$tr = print_package_entry($package, $uploader_array[$package], $back_tr_color, $skip_seen);
if($tr)
{
@@ -1247,7 +1255,7 @@ function filter_orphaned( $packages )
return $packages_filtered;
}
-function print_subscribed_packages($login, $comaint)
+function print_subscribed_packages($login)
{
# section1:pkg1 pkg2;section2:pkg3
@@ -1260,15 +1268,15 @@ function print_subscribed_packages($login, $comaint)
if (preg_match("/^uploader:(.*)/", $section, $secarray)) {
$uploaders = explode(" ", $secarray[1]);
foreach ($uploaders as $uploader)
- print_uploaded_packages(array($uploader), $comaint);
+ print_uploaded_packages(array($uploader));
continue;
}
preg_match("/^([^:]*):(.*)/", $section, $secarray);
- print_package_entries($secarray[1], $secarray[2], $comaint, 1);
+ print_package_entries($secarray[1], $secarray[2], 1);
}
}
-function print_uploaded_packages_part( $logins, $key_prefix, $database, $title, $comaint )
+function print_uploaded_packages_part( $logins, $key_prefix, $database, $title )
{
$pack_array = array();
@@ -1289,23 +1297,23 @@ function print_uploaded_packages_part( $logins, $key_prefix, $database, $title,
$packages = implode( " ", $pack_array );
if( $packages )
- print_package_entries( $title, $packages, $comaint, 1 );
+ print_package_entries( $title, $packages, 1 );
}
-function print_uploaded_packages($logins, $comaint)
+function print_uploaded_packages($logins)
{
global $incoming_db;
global $uploads_db;
- print_uploaded_packages_part( $logins, "", $incoming_db, "Pending uploads", $comaint );
- print_uploaded_packages_part( $logins, "op:", wnpp_db(), "Owned WNPP bugs", $comaint );
- print_uploaded_packages_part( $logins, "bpo:", $incoming_db, "Stable backports", $comaint );
- print_uploaded_packages_part( $logins, "nmu:", $uploads_db, "Non-maintainer uploads", $comaint );
- print_uploaded_packages_part( $logins, "qa:", $uploads_db, "QA uploads", $comaint );
- print_uploaded_packages_part( $logins, "", $uploads_db, "Sponsored/other uploads", $comaint );
+ print_uploaded_packages_part( $logins, "", $incoming_db, "Pending uploads" );
+ print_uploaded_packages_part( $logins, "op:", wnpp_db(), "Owned WNPP bugs" );
+ print_uploaded_packages_part( $logins, "bpo:", $incoming_db, "Stable backports" );
+ print_uploaded_packages_part( $logins, "nmu:", $uploads_db, "Non-maintainer uploads" );
+ print_uploaded_packages_part( $logins, "qa:", $uploads_db, "QA uploads" );
+ print_uploaded_packages_part( $logins, "", $uploads_db, "Sponsored/other uploads" );
}
-function print_signed_uploads( $carnivoreid, $comaint )
+function print_signed_uploads( $carnivoreid )
{
global $incoming_db;
@@ -1318,10 +1326,10 @@ function print_signed_uploads( $carnivoreid, $comaint )
$packages = implode( " ", $pack_array );
if( $packages )
- print_package_entries( "Pending signed uploads", $packages, $comaint, 1 );
+ print_package_entries( "Pending signed uploads", $packages, 1 );
}
-function print_given_dm_permissions( $carnivoreid, $comaint )
+function print_given_dm_permissions( $carnivoreid )
{
$pack_array = array();
@@ -1332,10 +1340,10 @@ function print_given_dm_permissions( $carnivoreid, $comaint )
$packages = implode( " ", $pack_array );
if( $packages )
- print_package_entries( "Given DM permissions", $packages, $comaint, 0 );
+ print_package_entries( "Given DM permissions", $packages, 0 );
}
-function print_developer($login, $name, $comaint)
+function print_developer($login, $name)
{
global $components;
global $pack_db;
@@ -1345,17 +1353,17 @@ function print_developer($login, $name, $comaint)
$seen_packages = array();
print_header_entries_top($login, $name);
- print_header_entries_body($comaint, $login, $name);
+ print_header_entries_body($login, $name);
/* ordering 3: print subscribed packages first. Subscribed packages will
* not show up in main/contrib/non-free (and vice-versa for other
* orderings) */
if(isdisplayed('ordering') == 3)
- print_subscribed_packages($login, $comaint);
+ print_subscribed_packages($login);
foreach ($components as $component) {
$packages = dba_fetch(strtolower($login).":$component", $pack_db);
if ($packages != "") {
- print_package_entries($component, $packages, $comaint, 1);
+ print_package_entries($component, $packages, 1);
$no_packages = true;
} elseif (! $no_packages) {
print html_h("No packages in unstable", 3);
@@ -1363,15 +1371,15 @@ function print_developer($login, $name, $comaint)
}
}
if(isdisplayed('ordering') != 3)
- print_subscribed_packages($login, $comaint);
+ print_subscribed_packages($login);
if(isdisplayed('packages'))
- print_package_entries("url", isdisplayed('packages'), $comaint, 1);
+ print_package_entries("url", isdisplayed('packages'), 1);
if(isdisplayed('uploads'))
- print_uploaded_packages(array($login), $comaint);
+ print_uploaded_packages(array($login));
if(isdisplayed('uploader')) {
$uploaders = explode(" ", isdisplayed('uploader'));
foreach ($uploaders as $uploader)
- print_uploaded_packages(array($uploader), $comaint);
+ print_uploaded_packages(array($uploader));
}
}
@@ -1415,7 +1423,6 @@ function email_has_packages( $email )
function output_emails( $emails )
{
global $pack_db;
- global $comaint;
global $global_carnivoreid;
$emails_array = explode( " ", $emails );
@@ -1433,7 +1440,7 @@ function output_emails( $emails )
$name = $names[0];
}
$global_carnivoreid = carnivoreemail2carnivoreid( $email );
- print_developer( $email, $name, $comaint );
+ print_developer( $email, $name );
$global_carnivoreid = "";
}
}
@@ -1489,7 +1496,6 @@ function carnivoreid2carnivorenames( $carnivoreid )
function output_carnivoreid( $carnivoreid )
{
- global $comaint;
$emails = array();
foreach( carnivoreid2emails( $carnivoreid ) as $email )
if( email_has_packages( $email ) )
@@ -1525,13 +1531,13 @@ function output_carnivoreid( $carnivoreid )
foreach( $emails as $email )
{
- print_header_entries_body($comaint, $email, $name);
+ print_header_entries_body($email, $name);
print html_br();
}
if(isdisplayed('ordering') == 3)
foreach( $emails as $email )
- print_subscribed_packages( $email, $comaint );
+ print_subscribed_packages( $email );
global $components;
global $pack_db;
@@ -1543,35 +1549,35 @@ function output_carnivoreid( $carnivoreid )
sort( $packages, SORT_STRING );
if( $name != "Debian QA Group" )
$packages = filter_orphaned( $packages );
- print_package_entries($component, implode( " ", $packages ), $comaint, 1);
+ print_package_entries($component, implode( " ", $packages ), 1);
}
if( $name == "Debian QA Group" )
{
$packages = orphaned_packages();
sort( $packages, SORT_STRING );
- print_package_entries( "Orphaned packages to be moved to ".$name, implode( " ", $packages ), $comaint, 1 );
+ print_package_entries( "Orphaned packages to be moved to ".$name, implode( " ", $packages ), 1 );
}
if(isdisplayed('ordering') != 3)
foreach( $emails as $email )
- print_subscribed_packages( $email, $comaint );
+ print_subscribed_packages( $email );
if(isdisplayed('packages'))
- print_package_entries("url", isdisplayed('packages'), $comaint, 1);
+ print_package_entries("url", isdisplayed('packages'), 1);
if(isdisplayed('uploads'))
- print_uploaded_packages( $emails, $comaint );
+ print_uploaded_packages( $emails );
if(isdisplayed('uploader')) {
$uploaders = explode(" ", isdisplayed('uploader'));
foreach ($uploaders as $uploader)
- print_uploaded_packages(array($uploader), $comaint);
+ print_uploaded_packages(array($uploader));
}
if(isdisplayed('uploads'))
- print_signed_uploads( $carnivoreid, $comaint );
+ print_signed_uploads( $carnivoreid );
- print_given_dm_permissions( $carnivoreid, $comaint );
+ print_given_dm_permissions( $carnivoreid );
$global_carnivoreid = "";
}
@@ -1637,12 +1643,6 @@ foreach( array( "oldstable", "stable" ) as $dist )
$releases_re .= $dist2release[$dist];
}
-$comaint = $_REQUEST['comaint'];
-
-if (! preg_match($comaint_re, $comaint)) {
- $comaint = "yes";
-}
-
if ($excuse = $_REQUEST['excuse'] and preg_match($filter_re, $excuse)) {
$excuse_quoted = rawurlencode($excuse);
header('Status: 302 Redirect');
@@ -1733,7 +1733,7 @@ if ($excuse = $_REQUEST['excuse'] and preg_match($filter_re, $excuse)) {
} elseif($packages = $_REQUEST['packages'] and preg_match($filter_re, $packages)) {
start_output();
- print_package_entries("Packages", $packages, $comaint, 1);
+ print_package_entries("Packages", $packages, 1);
printBackLink();
} elseif($task = $_REQUEST['task'] and preg_match($filter_re, $task)) {
@@ -1741,7 +1741,7 @@ if ($excuse = $_REQUEST['excuse'] and preg_match($filter_re, $excuse)) {
$packages = dba_fetch("t:$task", $task_db);
if ($packages) {
start_output();
- print_package_entries("Task: $task", $packages, $comaint, 1);
+ print_package_entries("Task: $task", $packages, 1);
} else {
header('Status: 404 Not Found', FALSE, 404);
start_output();
@@ -1753,7 +1753,7 @@ if ($excuse = $_REQUEST['excuse'] and preg_match($filter_re, $excuse)) {
$packages = dba_fetch("tag:$wnpp", wnpp_db() );
if ($packages) {
start_output();
- print_package_entries("WNPP Tag $wnpp", $packages, $comaint, 1);
+ print_package_entries("WNPP Tag $wnpp", $packages, 1);
} else {
header('Status: 404 Not Found', FALSE, 404);
start_output();
--
1.8.3.rc2
Attachment:
signature.asc
Description: This is a digitally signed message part