]> git.donarmstrong.com Git - debbugs.git/commitdiff
projects / debbugs.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from parent 1: 985d774)
merge changes from dla source tree
authorDebian BTS <debbugs@rietz>
Wed, 24 Sep 2008 23:11:01 +0000 (23:11 +0000)
committerDebian BTS <debbugs@rietz>
Wed, 24 Sep 2008 23:11:01 +0000 (23:11 +0000)
Debbugs/Common.pm patch | blob | history
cgi/bugreport.cgi patch | blob | history
cgi/pkgreport.cgi patch | blob | history
debian/changelog patch | blob | history
html/bugs.css patch | blob | history
templates/en_US/cgi/no_such_bug.tmpl patch | blob | history
templates/en_US/cgi/pkgreport_javascript.tmpl patch | blob | history

diff --git a/Debbugs/Common.pm b/Debbugs/Common.pm
index a444a469d432a258556c8c9cf7436d406f94593a..87b355924458444536aff9a27c2a1d3a52ee593e 100644 (file)
--- a/Debbugs/Common.pm
+++ b/Debbugs/Common.pm
@@ -162,6 +162,8 @@ sub get_hashname {
 
 Returns the path to the logfile corresponding to the bug.
 
+Returns undef if the bug does not exist.
+
 =cut
 
 sub buglog {
@@ -169,7 +171,8 @@ sub buglog {
     my $location = getbuglocation($bugnum, 'log');
     return getbugcomponent($bugnum, 'log', $location) if ($location);
     $location = getbuglocation($bugnum, 'log.gz');
-    return getbugcomponent($bugnum, 'log.gz', $location);
+    return getbugcomponent($bugnum, 'log.gz', $location) if ($location);
+    return undef;
 }
 
 
diff --git a/cgi/bugreport.cgi b/cgi/bugreport.cgi
index b325863e8b699a95585e1f4276bde50f7a85ce7d..d01a286bf39e9097db6efc2e8f27fb0620bdab0c 100755 (executable)
--- a/cgi/bugreport.cgi
+++ b/cgi/bugreport.cgi
@@ -71,6 +71,14 @@ my $archive = $param{'archive'} eq 'yes';
 my $repeatmerged = $param{'repeatmerged'} eq 'yes';
 
 my $buglog = buglog($ref);
+if (not defined $buglog) {
+     print $q->header(-status => "404 No such bug",
+                     -type => "text/html",
+                     -charset => 'utf-8',
+                    );
+     exit 0;
+}
+
 my @stat = stat $buglog;
 my $mtime = '';
 if (@stat) {
diff --git a/cgi/pkgreport.cgi b/cgi/pkgreport.cgi
index 800c4715e83f29d68e03f3843c4c73f199ab44f7..2a69dfd1497713f05f4fa327173e186561fcb1ff 100755 (executable)
--- a/cgi/pkgreport.cgi
+++ b/cgi/pkgreport.cgi
@@ -441,6 +441,7 @@ print "<HTML><HEAD>\n" .
     "</HEAD>\n" .
     '<BODY onload="pagemain();">' .
     "\n";
+print qq(<DIV id="status_mask"></DIV>\n);
 print "<H1>" . "$gProject$Archived $gBug report logs: $title" .
       "</H1>\n";
 
diff --git a/debian/changelog b/debian/changelog
index 2982cfeb9060b5906bfe3d17b05ac2bfbb890616..949ef46a33283457dd7b94858bfd19561fce95ab 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -220,6 +220,10 @@ debbugs (2.4.2) UNRELEASED; urgency=low
   * Link to packages in bugreport page (closes: #229067)
   * Totally revamp the pkgreport templates (closes: #434504)
   * Add correspondent option to track bug correpondents (closes: #485804)
+  * Allow clicking anywhere outside the extra status box to close the
+    extra status box (closes: #499990) Thanks to James Vega for the patch.
+  * Return 404 when a bug number that does not exist is used
+    (closes: #499997)
 
   
  -- Colin Watson <cjwatson@debian.org>  Fri, 20 Jun 2003 18:57:25 +0100
diff --git a/html/bugs.css b/html/bugs.css
index 2a320f4b406620af184fe3a7ae2e8677e37a76ef..b61e5b140fdb96fb113fb2975ed559aeee4616af 100644 (file)
--- a/html/bugs.css
+++ b/html/bugs.css
@@ -252,6 +252,19 @@ li {
   display: inline;
   }
 
+#status_mask {
+    -moz-opacity: 0;
+    opacity: 0;
+    filter: alpha(opacity=0);
+    z-index: 1;
+    position: absolute;
+    width: 100%;
+    height: 100%;
+    top: 0px;
+    left: 0px;
+    display: none;
+}
+
 .bugs li {
     margin-top: 5px;
 }
diff --git a/templates/en_US/cgi/no_such_bug.tmpl b/templates/en_US/cgi/no_such_bug.tmpl
index 107f9f29aeba22ebd96b65859bbcaec58ef4e881..5434b53be0f4385b97f1651579645e5c2387bbd2 100644 (file)
--- a/templates/en_US/cgi/no_such_bug.tmpl
+++ b/templates/en_US/cgi/no_such_bug.tmpl
@@ -5,5 +5,5 @@
 <h1>{$config{project}} {$config{bug}} report logs - #{$bug_num}</h1>
 <p>There is no record of {$config{bug}} #{$bug_num}.
 Try the <a href="http://{$config{web_domain}}/">search page</a> instead.</p>
-{include('html/tail')}
+{#include('html/html_tail')}
 </body></html>
diff --git a/templates/en_US/cgi/pkgreport_javascript.tmpl b/templates/en_US/cgi/pkgreport_javascript.tmpl
index f801df9632ef6de8922b9e2657304cde146bd3f4..a786cbfcd90df4cbd4130110723c27290ff9d719 100644 (file)
--- a/templates/en_US/cgi/pkgreport_javascript.tmpl
+++ b/templates/en_US/cgi/pkgreport_javascript.tmpl
@@ -26,7 +26,7 @@ function toggle_extra_status_visible() \{
         else \{
            all_divs[i].style.position = "absolute";
            all_divs[i].style.display = "none"
-           all_divs[i].style.zIndex = 1;
+           all_divs[i].style.zIndex = 2;
            all_divs[i].style.border = "#000 1px solid";
            var subspans = all_divs[i].getElementsByTagName("span");
            for (var j = 0; j < subspans.length; j++) \{
@@ -38,9 +38,13 @@ function toggle_extra_status_visible() \{
 \}
 
 function extra_status_visible(id) \{
+  var m = document.getElementById("status_mask");
   if (visible_extra_status) \{
      var t = document.getElementById("extra_status_"+visible_extra_status);
      t.style.display = "none";
+     if (m) \{
+        m.style.display = "none";
+     \}
      if (visible_extra_status == id) \{
        visible_extra_status = 0;
         return;
@@ -51,6 +55,10 @@ function extra_status_visible(id) \{
   if (e) \{
      e.style.display = "block";
      visible_extra_status = id;
+     if (m) \{
+        m.onclick = function() \{ extra_status_visible(id); \};
+        m.style.display = "block";
+     \}
   \}
 \}
 
Debian bug tracker development