Merge lp:~michael.nelson/ubuntu-webcatalog/store-apps-per-distroseries into lp:ubuntu-webcatalog
Status: | Merged | ||||||||
---|---|---|---|---|---|---|---|---|---|
Approved by: | Danny Tamez | ||||||||
Approved revision: | 19 | ||||||||
Merged at revision: | 13 | ||||||||
Proposed branch: | lp:~michael.nelson/ubuntu-webcatalog/store-apps-per-distroseries | ||||||||
Merge into: | lp:ubuntu-webcatalog | ||||||||
Diff against target: |
324 lines (+150/-13) 8 files modified
src/webcatalog/forms.py (+1/-0) src/webcatalog/management/commands/import_app_install_data.py (+30/-5) src/webcatalog/models.py (+15/-3) src/webcatalog/static/css/webcatalog.css (+29/-0) src/webcatalog/templates/webcatalog/application_detail.html (+3/-2) src/webcatalog/tests/factory.py (+15/-2) src/webcatalog/tests/test_commands.py (+47/-0) src/webcatalog/tests/test_views.py (+10/-1) |
||||||||
To merge this branch: | bzr merge lp:~michael.nelson/ubuntu-webcatalog/store-apps-per-distroseries | ||||||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Danny Tamez (community) | Approve | ||
Review via email: mp+60200@code.launchpad.net |
Commit message
[r=zematynnad][bug=777869,777454] Store apps per distroseries, update when importing and include install button.
Description of the change
Overview
========
This branch ensures that apps are stored per distroseries (bug 777869), and that apps are updated if they already exist in the distroseries (rather than duplicated).
I also added a very simple apt url to the details page to look like this (bug 777454):
http://
I'll create bugs for:
1) more sensible apt-urls (only display if correct distroseries, otherwise display "Not on this distroseries but yours..", or "only for ubuntu" etc.
2) Rendering of xpm icons for display on browser pages.
To test:
$ fab bootstrap
$ fab test
Looks good