Merge lp:~adeuring/launchpad/bug-39674-change-remaining-lfa-http_url into lp:launchpad/db-devel
Status: | Merged |
---|---|
Merged at revision: | 9619 |
Proposed branch: | lp:~adeuring/launchpad/bug-39674-change-remaining-lfa-http_url |
Merge into: | lp:launchpad/db-devel |
Diff against target: |
514 lines (+105/-48) 17 files modified
lib/canonical/launchpad/browser/librarian.py (+4/-2) lib/canonical/launchpad/webapp/launchbag.py (+1/-1) lib/canonical/librarian/client.py (+1/-0) lib/lp/bugs/adapters/bugchange.py (+13/-4) lib/lp/bugs/browser/bug.py (+8/-1) lib/lp/bugs/browser/bugattachment.py (+4/-2) lib/lp/bugs/browser/bugtarget.py (+5/-0) lib/lp/bugs/doc/bug-change.txt (+6/-4) lib/lp/bugs/doc/bug-export.txt (+1/-1) lib/lp/bugs/doc/bugnotification-email.txt (+10/-20) lib/lp/bugs/model/bugattachment.py (+5/-0) lib/lp/bugs/scripts/bugexport.py (+3/-1) lib/lp/bugs/stories/bugattachments/xx-attachments-to-bug-report.txt (+5/-1) lib/lp/bugs/stories/bugattachments/xx-delete-bug-attachment.txt (+3/-1) lib/lp/bugs/stories/bugs/xx-bug-text-pages.txt (+24/-5) lib/lp/bugs/templates/bugtarget-patches.pt (+2/-2) lib/lp/bugs/tests/test_bugchanges.py (+10/-3) |
To merge this branch: | bzr merge lp:~adeuring/launchpad/bug-39674-change-remaining-lfa-http_url |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Deryck Hodge (community) | code | Approve | |
Review via email: mp+31754@code.launchpad.net |
Description of the change
This branch changes the URLs of LFAs of bug attachments shown in
some web pages and notification emails from LFA.http_url to
ProxiedLibraryF
lib/canonical/
The URLs created by ProxiedLibraryF
escaped; non-ASCII-
in lib/lp/
I copied the pattern to generate URLs from LFA.http_url resp.
FileDownloadCli
lib/canonical/
Some tests failed because canonical_
launchbag.bugtask, but this property is not defined for a freshly created
launchbag.
lib/canonical/
The function quote() is now also used in ProxiedLibraryF
so it should appear in __all__.
lib/lp/
The data generated by class BugAttachmentChange when an attachment
is created or deleted now contains URLs from ProxiedLFAs.
lib/lp/
class BugView has a new method proxiedUrlForLi
is called from at least one page template. (Sorry, can't remember
which template is it -- this branch contains too many small changes...)
BugTextView.
lib/lp/
BugAttachmentEd
lib/lp/
A new helper method to get proxied LFA URLs in class BugsPatchesView,
similar to that ini class BugView.
lib/lp/
When notifications about a new bug attachment are created,
canonical_
bug attachment ID, and this ID is not available if the DB record
is not yet created. Hence the Store.of(
The remaining changes are in tests which are affected by the changed
URLs. The test lib/lp/
now looks quite ugly in line 197ff: The download URLs now start with
regular bug URLs, i.e., we can access the LFAs via
http://
as well as
http://
Which URL is created, depends on the existence of a bugtask in LaunchBag.
This is a bit silly for the file content, but I simply did not have enough
time to fix it, and I'd like to really make bug attachments private
for private bugs in the next release...
tests: many. All those which I touched...
The changes generally look good, Abel. Thanks for all the work you've been doing to get this ready!
I have two minor requests:
1) If there are bugs for these related issues that are fixed, can you link the branch to them so they get marked fixed when this lands?
2) Can you add a comment in code explaining why the flush is required?
Consider this r=me with these minor changes.
Cheers,
deryck