Merge lp://staging/~michael.nelson/ubuntu-webcatalog/1045328-bundle-promotion-apps into lp://staging/ubuntu-webcatalog
| Status: | Merged |
|---|---|
| Approved by: | Łukasz Czyżykowski |
| Approved revision: | 174 |
| Merged at revision: | 170 |
| Proposed branch: | lp://staging/~michael.nelson/ubuntu-webcatalog/1045328-bundle-promotion-apps |
| Merge into: | lp://staging/ubuntu-webcatalog |
| Diff against target: |
456 lines (+278/-19) 10 files modified
src/webcatalog/admin.py (+15/-0) src/webcatalog/migrations/0029_add_application_widget.py (+191/-0) src/webcatalog/models/__init__.py (+2/-0) src/webcatalog/models/applications.py (+14/-0) src/webcatalog/schema.py (+0/-2) src/webcatalog/templates/webcatalog/application_detail.html (+3/-6) src/webcatalog/templatetags/webcatalog.py (+7/-0) src/webcatalog/tests/factory.py (+11/-0) src/webcatalog/tests/test_views.py (+35/-8) src/webcatalog/views.py (+0/-3) |
| To merge this branch: | bzr merge lp://staging/~michael.nelson/ubuntu-webcatalog/1045328-bundle-promotion-apps |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Łukasz Czyżykowski (community) | Approve | ||
|
Review via email:
|
|||
Commit message
Add ApplicationWidget model for dynamic campaign widgets.
Description of the change
Overview
========
This branch adds the ApplicationWidget model which can be used to display custom widgets on any application detail page (see bug 1045328).
`fab test`
Notes:
* I tried a few options for the model-admin, like tabularinline, but raw_id_field was the only way to *not* present the whole list of apps. The good thing is it presents lots of info about each app to decide, the bad thing is it results in a list of ids, which are opaque once set. We may want to investigate further if it is difficult to use.
* I considered having a widget per application (implemented) and a widget per package_name (what the existing setting did). I went for the DB relationship on application, which is more general (ie. could potentially select only certain distroseries versions of an app to include the widget), but may be more fiddly to use (need to select multiple versions of each app).
| Łukasz Czyżykowski (lukasz-czyzykowski) | # |
