[Collab-qa-commits] r378 - in svnbuildstat: lib/SvnBuildStat/WWW/Controller root/lib/site root/src/packages
goneri-guest at alioth.debian.org
goneri-guest at alioth.debian.org
Sat Aug 11 01:40:42 UTC 2007
Author: goneri-guest
Date: 2007-08-11 01:40:42 +0000 (Sat, 11 Aug 2007)
New Revision: 378
Modified:
svnbuildstat/lib/SvnBuildStat/WWW/Controller/Packages.pm
svnbuildstat/root/lib/site/html
svnbuildstat/root/src/packages/info.tt2
svnbuildstat/root/src/packages/main.tt2
Log:
some improvment for the interface
print the TODO file and the last changelog entry
warns about not uploaded packages with Closes: XXX in there changelog
Modified: svnbuildstat/lib/SvnBuildStat/WWW/Controller/Packages.pm
===================================================================
--- svnbuildstat/lib/SvnBuildStat/WWW/Controller/Packages.pm 2007-08-11 01:39:01 UTC (rev 377)
+++ svnbuildstat/lib/SvnBuildStat/WWW/Controller/Packages.pm 2007-08-11 01:40:42 UTC (rev 378)
@@ -70,7 +70,7 @@
} elsif ($param =~ /^\d+$/) {
$c->stash->{maintainer} = $c->model('SvnBuildStat::WWW::Model::DB::Repository')->search({id => $param})->first;
$c->stash->{packages} = [ $c->model('SvnBuildStat::WWW::Model::DB::Viewpackage')->search({ repository_id => $param },{order_by=>"name"}) ];
- } else { # I don't want to kill my server with to much request
+ } else { # I don't want to kill my server with too much request
$c->response->redirect($c->uri_for('/repositorys/list'));
return;
}
@@ -89,6 +89,9 @@
$c->response->redirect($c->uri_for('/'));
return;
}
+
+ my @currentchangelogentry = split $/, $package->currentchangelogentry;
+ my @todo = split $/, $package->todo;
$c->stash->{package} = $package->name;
$c->stash->{bugpic} = $package->name;
$c->stash->{bugpic} =~ s!^(.)(.+)$!http://people.debian.org/~glandium/bts/$1/$1$2.png! ;
@@ -102,6 +105,8 @@
$c->stash->{weburi} =~ s!svn://svn.debian.org/svn!http://svn.debian.org/wsvn!;
$c->stash->{isuptodate} = $package->isuptodate;
$c->stash->{upstreamrelease} = $package->upstreamrelease;
+ $c->stash->{currentchangelogentry} = \@currentchangelogentry;
+ $c->stash->{todo} = \@todo;
############ Maintainers list
my $packagemaintainer_rs = $c->model('SvnBuildStat::WWW::Model::DB::PackageMaintainer')->search({package_id => $package->id});
$c->stash->{maintainers} = [ $packagemaintainer_rs->search_related("maintainer_id")->all ];
Modified: svnbuildstat/root/lib/site/html
===================================================================
--- svnbuildstat/root/lib/site/html 2007-08-11 01:39:01 UTC (rev 377)
+++ svnbuildstat/root/lib/site/html 2007-08-11 01:40:42 UTC (rev 378)
@@ -5,7 +5,20 @@
<style type="text/css">
[% PROCESS ttsite.css %]
</style>
- </head>
+ <!-- http://www.webmasterworld.com/forum91/441.htm -->
+ <script>
+ function showhide(id){
+ if (document.getElementById){
+ obj = document.getElementById(id);
+ if (obj.style.display == "none"){
+ obj.style.display = "";
+ } else {
+ obj.style.display = "none";
+ }
+ }
+ }
+</script>
+</head>
<body>
[% content %]
Modified: svnbuildstat/root/src/packages/info.tt2
===================================================================
--- svnbuildstat/root/src/packages/info.tt2 2007-08-11 01:39:01 UTC (rev 377)
+++ svnbuildstat/root/src/packages/info.tt2 2007-08-11 01:40:42 UTC (rev 378)
@@ -14,6 +14,18 @@
[% END -%]
</table>
+[% IF ! isindebian %]
+ <h2><a href="#" onclick="showhide('currentchangelogentry'); return(false);">This release is not yet in Debian</a></h2>
+ <div id="currentchangelogentry">
+ Current changelog entry:
+ <blockquote>
+ [% FOREACH line IN currentchangelogentry -%]
+ [% line %]<br />
+ [% END -%]
+ </blockquote>
+ </div>
+[% END %]
+
<h2>URI</h2>
<table>
<tr>
@@ -38,14 +50,21 @@
[% END %]
</table>
-[% IF isindebian %]
- <div>This release is in Debian</div>
-[% ELSE %]
- <div>This release is not in Debian</div>
-[% END %]
+[% IF todo %]
+<h2><a href="#" onclick="showhide('todo'); return(false);">TODO list</a></h2>
+<div id="todo">
+ <blockquote>
+ [% FOREACH line IN todo -%]
+ [% line %]<br />
+ [% END -%]
+ </blockquote>
+</div>
+[% END -%]
+
[% IF bugs %]
-<h2>Bugs</h2>
+<h2><a href="#" onclick="showhide('bugs'); return(false);">Bugs</a></h2>
+<div id="bugs">
<img src="[% bugpic %]" alt="bug graph"/>
<table>
[% # Display each book in a table row %]
@@ -60,10 +79,12 @@
</tr>
[% END -%]
</table>
+</div>
[% END -%]
[% IF builds %]
-<h2>Builds</h2>
+<h2><a href="#" onclick="showhide('build'); return(false);">Builds</a></h2>
+<div id="build">
<table>
<tr><th>Status</th><th>Arch</th><th>Svn Rev.</th><th>Date</th><th>Build duration</th></tr>
[% # Display each book in a table row %]
@@ -97,7 +118,7 @@
</tr>
[% END -%]
</table>
-
+</div>
<h2>piuparts</h2>
[% IF piupartsisok %]
<a href="[% Catalyst.uri_for('/logs/piuparts/') _ build.id %]">piuparts checks successed</a>
@@ -106,7 +127,8 @@
[% END %]
[% IF lintians %]
-<h2>lintian</h2>
+<h2><a href="#" onclick="showhide('lintian'); return(false);">lintian</a></h2>
+<div id="lintian">
<table>
[% FOREACH lintian IN lintians %]
<tr>
@@ -116,10 +138,12 @@
</tr>
[% END -%]
</table>
+</div>
[% END %]
[% IF lindas %]
-<h2>linda</h2>
+<h2><a href="#" onclick="showhide('linda'); return(false);">linda</a></h2>
+<div id="linda">
<table>
[% FOREACH linda IN lindas %]
<tr>
@@ -129,6 +153,7 @@
</tr>
[% END -%]
</table>
+</div>
[% END %]
[% ELSE %]
Modified: svnbuildstat/root/src/packages/main.tt2
===================================================================
--- svnbuildstat/root/src/packages/main.tt2 2007-08-11 01:39:01 UTC (rev 377)
+++ svnbuildstat/root/src/packages/main.tt2 2007-08-11 01:40:42 UTC (rev 378)
@@ -58,7 +58,12 @@
</a>
</td>-->
<td [% IF package.isindebian %]class="ok"[% ELSE %]class="warning"[% END %]>
- [% IF ! package.isindebian %]No[% END %]
+ [% IF ! package.isindebian %]Not uploaded yet<br />
+[% FOREACH bug IN package.currentpendingbug.split(',') %]
+ <a href="http://bugs.debian.org/[% bug %]">Closes: #[% bug %]</a><br />
+ [% END %]
+
+[% END %]
</td>
<td [% IF package.iswatchfilebroken || package.isuptodate == 0 %]class="error"[% ELSE %][% IF package.isuptodate == 1 || package.isnative == 1 %]class="ok"[% ELSE %]class="warning"[% END %][% END %]>
<a href="[% Catalyst.uri_for('info/') _ package.name %]">
@@ -68,8 +73,7 @@
[% IF package.iswatchfilebroken == 1 %]
Broken watch file
[% ELSE%]
- [% IF package.isuptodate == 0 %]No[% END %]
- [% IF package.isuptodate == 1 %]Yes[% END %]
+ [% IF package.isuptodate == 0 %]New upstream release[% END %]
[% IF package.isuptodate == "" %]No watch file[% END %]
[% END %]
[% END %]
More information about the Collab-qa-commits
mailing list