Merge lp://staging/~gepatino/ubuntu-accomplishments-web/trunk into lp://staging/ubuntu-accomplishments-web
Proposed by
Gabriel Patiño
| Status: | Merged |
|---|---|
| Merged at revision: | 99 |
| Proposed branch: | lp://staging/~gepatino/ubuntu-accomplishments-web/trunk |
| Merge into: | lp://staging/ubuntu-accomplishments-web |
| Diff against target: |
648 lines (+120/-109) 15 files modified
common/admin.py (+3/-3) common/fixtures/accomplishments.json (+2/-2) common/fixtures/categories.json (+3/-3) common/fixtures/collections.json (+2/-2) common/fixtures/icons.json (+2/-2) common/models.py (+15/-20) common/tests-data/ja/dummy.accomplishment (+1/-1) common/utils.py (+34/-26) editor/templates/index.html (+4/-4) editor/templates/queue.html (+3/-3) editor/tests.py (+15/-15) editor/views.py (+20/-14) gallery/views.py (+12/-10) scripts/dumpdata.sh (+2/-2) scripts/loaddata.sh (+2/-2) |
| To merge this branch: | bzr merge lp://staging/~gepatino/ubuntu-accomplishments-web/trunk |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| ubuntu-accomplishments-web-editor-drivers | Pending | ||
|
Review via email:
|
|||
Description of the change
Renamed Application model to Collection, doing the proper refactoring.
Take into account that tables and field names in DB have changed. The easier way to apply this change is to delete the sqlite3.db file, syncb and import_
Let me know if you need some sqls to alter tables in a production environment.
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
