← Back to branch summary

~azzar1/unity/add-show-desktop-key

« back to all changes in this revision

Viewing changes to www/apps/userservice/__init__.py

  • Committer: William Grant
  • Date: 2009-01-20 02:03:32 UTC
  • mto: This revision was merged to the branch mainline in revision 1090.
  • Revision ID: grantw@unimelb.edu.au-20090120020332-oi1xk22zpb0iodfz
ivle.database.Offering: Add a members ReferenceSet.
www/apps/userservice: Replace get_{projectgroup,offering}_members calls with
    Storm ones, constructing the dict-lists manually as usual.
ivle.db.get_{offering,projectgroup}_members: Kill. Unused.

Show diffs side-by-side

added added

removed removed

Lines of Context:
www/apps/userservice/__init__.py
753
753
    except:
754
754
        req.throw_error(req.HTTP_BAD_REQUEST,
755
755
            "groupid must be an int")
 
756
    group = req.store.get(ivle.database.ProjectGroup, groupid)
 
757
 
756
758
    try:
757
759
        offeringid = int(offeringid)
758
760
    except:
759
761
        req.throw_error(req.HTTP_BAD_REQUEST,
760
762
            "offeringid must be an int")
761
 
 
762
 
    db = ivle.db.DB()
763
 
    try:
764
 
        offeringmembers = db.get_offering_members(offeringid)
765
 
        groupmembers = db.get_projectgroup_members(groupid)
766
 
    finally:
767
 
        db.close()
768
 
    
 
763
    offering = req.store.get(ivle.database.Offering, offeringid)
 
764
 
 
765
 
 
766
    offeringmembers = [{'login': user.login,
 
767
                        'fullname': user.fullname
 
768
                       } for user in offering.members.order_by(
 
769
                            ivle.database.User.login)
 
770
                      ]
 
771
    groupmembers = [{'login': user.login,
 
772
                        'fullname': user.fullname
 
773
                       } for user in group.members.order_by(
 
774
                            ivle.database.User.login)
 
775
                      ]
 
776
 
769
777
    # Make sure we don't include members in both lists
770
778
    for member in groupmembers:
771
779
        if member in offeringmembers: