Ubuntu Accomplishments System

Merge lp:~brunogirin/ubuntu-accomplishments-system/fix-lp945796 into lp:~jonobacon/ubuntu-accomplishments-system/trophyinfo

  1. fix-lp945796
  2. Merge into trophyinfo
Proposed by Bruno Girin
Status: Merged
Merged at revision: 66
Proposed branch: lp:~brunogirin/ubuntu-accomplishments-system/fix-lp945796
Merge into: lp:~jonobacon/ubuntu-accomplishments-system/trophyinfo
Diff against target: 11 lines (+1/-1)
1 file modified
trophyinfo/TrophyinfoWindow.py (+1/-1)
To merge this branch: bzr merge lp:~brunogirin/ubuntu-accomplishments-system/fix-lp945796
Reviewer Review Type Date Requested Status
Jono Bacon Approve
Review via email: mp+95775@code.launchpad.net

Description of the change

Change to '==' rather than 'in' when checking the name of dependent accomplishments.

To post a comment you must log in.
Revision history for this message
Jono Bacon (jonobacon) wrote :

Many thanks for this, Bruno. I have merged this in!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'trophyinfo/TrophyinfoWindow.py'
2--- trophyinfo/TrophyinfoWindow.py 2012-02-22 05:33:30 +0000
3+++ trophyinfo/TrophyinfoWindow.py 2012-03-04 10:50:24 +0000
4@@ -501,7 +501,7 @@
5 depapp, depaccom = dep.split("/", 1)
6 #print app, accom
7 for depa in self.accomdb:
8- if depapp in depa["application"] and depaccom in depa["accomplishment"]:
9+ if depapp == depa["application"] and depaccom == depa["accomplishment"]:
10 print depa["title"]
11 html = html + "<tr><td><img src='" + str(get_media_file("lock-icon.png")) + "' height='20' /></td><td>This is locked. You need to complete <strong>" + depa["title"] + "</strong> from <strong>" + depa["application-human"] + "</strong> first.</td></tr>"
12

Subscribers

People subscribed via source and target branches