Ubuntu Apps Directory

Merge lp://staging/~michael.nelson/ubuntu-webcatalog/1002262-dont-insert-errors-via-ajax into lp://staging/ubuntu-webcatalog

1002262-dont-insert-errors-via-ajax
Merge into trunk

Proposed by Michael Nelson on 2012-05-25

Status:

Merged

Approved by:

Łukasz Czyżykowski on 2012-05-29

Approved revision:

130

Merged at revision:

124

Proposed branch:

lp://staging/~michael.nelson/ubuntu-webcatalog/1002262-dont-insert-errors-via-ajax

Merge into:

lp://staging/ubuntu-webcatalog

Diff against target:

128 lines (+42/-10)

5 files modified

src/webcatalog/forms.py (+1/-1)
src/webcatalog/templates/webcatalog/application_detail.html (+11/-7)
src/webcatalog/tests/test_views.py (+20/-0)
src/webcatalog/utilities.py (+1/-1)
src/webcatalog/views.py (+9/-1)

To merge this branch:

bzr merge lp://staging/~michael.nelson/ubuntu-webcatalog/1002262-dont-insert-errors-via-ajax

High

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
Łukasz Czyżykowski (community)		2012-05-25	Approve on 2012-05-25
Review via email: mp+107341@code.staging.launchpad.net

Commit message

Handle multiple apps per packagename/distroseries and other potential view and api errors when requesting reviews.

Description of the change

Overview
========

Contrary to the branch name, the issue was not related to any API call or ajax response. See bug 1002262 for the details, but in summary, we've now got multiple applications with the same packagename and distroseries in the DB (skype, unity-lens-utilities) - perhaps as a result of importing from both extras and myapps [1].

`fab test`

[1] Note: due to another bug, even if we've since removed the app from the published apps on myapps, the corresponding record won't have been removed in uwc - we only import new ones - bug 985446.

Revision history for this message

Łukasz Czyżykowski (lukasz-czyzykowski) wrote on 2012-05-25:

LGTM

review: Approve

Revision history for this message

Michael Nelson (michael.nelson) wrote on 2012-05-25:

I've just pushed up some further changes that:

1) Ensures that if in the future, the reviews view 500's for some other reason, we won't display the result, and
2) Ensures that if in the future, the rnr api does return an error, we catch it rather than also erroring.

Revision history for this message

ISD Branch Mangler (isd-branches-mangler) wrote on 2012-05-25:

There are additional revisions which have not been approved in review. Please seek review and approval of these new revisions.