Launchpad itself

Merge lp://staging/~intellectronica/launchpad/distroseries-source-package-filebug-no-redirect into lp://staging/launchpad

  1. distroseries-source-package-filebug-no-redirect
  2. Merge into devel
Proposed by Eleanor Berger
Status: Merged
Approved by: Brad Crittenden
Approved revision: no longer in the source branch.
Merged at revision: not available
Proposed branch: lp://staging/~intellectronica/launchpad/distroseries-source-package-filebug-no-redirect
Merge into: lp://staging/launchpad
Diff against target: None lines
To merge this branch: bzr merge lp://staging/~intellectronica/launchpad/distroseries-source-package-filebug-no-redirect
Reviewer Review Type Date Requested Status
Brad Crittenden (community) release-critical Approve
Henning Eggers (community) code Approve
Review via email: mp+12232@code.staging.launchpad.net
To post a comment you must log in.
Revision history for this message
Eleanor Berger (intellectronica) wrote :

When the user tries to file a bug on ubuntu we redirect them to a wiki page telling them they should use apport. we block that redirection if the user provides the no-redirect parameter, but that parameter needs to be carried on if we redirect to a new context.

Revision history for this message
Henning Eggers (henninge) :
review: Approve (code)
Revision history for this message
Brad Crittenden (bac) wrote :

Thanks for the additional test, Tom.

review: Approve (release-critical)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'configs/development/launchpad-lazr.conf'
--- configs/development/launchpad-lazr.conf 2009-09-14 19:32:10 +0000
+++ configs/development/launchpad-lazr.conf 2009-09-22 15:47:48 +0000
@@ -160,6 +160,7 @@
160debbugs_db_location: lib/canonical/launchpad/scripts/tests160debbugs_db_location: lib/canonical/launchpad/scripts/tests
161comments_list_max_length: 7161comments_list_max_length: 7
162comments_list_truncate_to: 4162comments_list_truncate_to: 4
163ubuntu_disable_filebug: false
163164
164[mailman]165[mailman]
165launch: True166launch: True
166167
=== modified file 'lib/lp/registry/browser/distroseries.py'
--- lib/lp/registry/browser/distroseries.py 2009-09-15 01:17:46 +0000
+++ lib/lp/registry/browser/distroseries.py 2009-09-22 15:47:48 +0000
@@ -352,8 +352,11 @@
352 Filing a bug on a distribution series is not directly352 Filing a bug on a distribution series is not directly
353 permitted; we redirect to the distribution's file353 permitted; we redirect to the distribution's file
354 """354 """
355 distro_url = canonical_url(self.context.distribution)355 distro_url = canonical_url(
356 return self.request.response.redirect(distro_url + "/+filebug")356 self.context.distribution, view_name='+filebug')
357 if self.request.form.get('no-redirect') is not None:
358 distro_url += '?no-redirect'
359 return self.request.response.redirect(distro_url)
357360
358 @property361 @property
359 def show_arch_selector(self):362 def show_arch_selector(self):
360363
=== modified file 'lib/lp/registry/browser/sourcepackage.py'
--- lib/lp/registry/browser/sourcepackage.py 2009-09-18 12:18:51 +0000
+++ lib/lp/registry/browser/sourcepackage.py 2009-09-22 15:47:48 +0000
@@ -65,7 +65,11 @@
65 distro_sourcepackage = sourcepackage.distribution.getSourcePackage(65 distro_sourcepackage = sourcepackage.distribution.getSourcePackage(
66 sourcepackage.name)66 sourcepackage.name)
6767
68 return redirection(canonical_url(distro_sourcepackage) + "/+filebug")68 redirection_url = canonical_url(
69 distro_sourcepackage, view_name='+filebug')
70 if self.request.form.get('no-redirect') is not None:
71 redirection_url += '?no-redirect'
72 return redirection(redirection_url)
6973
7074
71class SourcePackageBreadcrumb(Breadcrumb):75class SourcePackageBreadcrumb(Breadcrumb):