← 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 01:44:20 UTC
  • mto: This revision was merged to the branch mainline in revision 1090.
  • Revision ID: grantw@unimelb.edu.au-20090120014420-t40ofmnvysps6ii9
ivle.database.ProjectSet: Add projects and project_groups referencesets.
www/apps/userservice: Don't use get_groups_by_projectset; construct the list
    of dicts manually.
ivle.db.get_groups_by_projectset: Remove. Unused. 

Show diffs side-by-side

added added

removed removed

Lines of Context:
www/apps/userservice/__init__.py
526
526
            dict_projectsets.append({
527
527
                'projectsetid': p.id,
528
528
                'max_students_per_group': p.max_students_per_group,
529
 
                'groups': db.get_groups_by_projectset(p.id),
 
529
                'groups': [{'groupid': g.id,
 
530
                            'groupnm': g.name,
 
531
                            'nick': g.nick} for g in p.project_groups]
530
532
            })
531
533
    except Exception, e:
532
534
        req.throw_error(req.HTTP_INTERNAL_SERVER_ERROR, repr(e))