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

Committer: Nick Chadwick
Date: 2009-04-06 13:42:10 UTC
mfrom: (1165.2.3 submissions)
mto: (1165.5.4 submissions-subversion-acls)
mto: This revision was merged to the branch mainline in revision 1247.
Revision ID: chadnickbok@gmail.com-20090406134210-msilhncp3mnvtdcn

Merged my changes with those of Will's up-to-date branch.

I will now branch these changes to allow for a merge proposal to go
ahead without me poisoning it with new code.

files added:
ivle/webapp/admin/project_service.py

ivle/webapp/admin/subject-media/project.css

ivle/webapp/admin/subject_projects.html

files modified:
ivle/database.py

ivle/webapp/admin/subject.py

ivle/webapp/base/rest.py

Show diffs side-by-side

added added

removed removed

ivle/database.py

612

if user.admin:

613

perms.add('edit')

614

perms.add('view')

615

elif 'lecturer' in set((e.role for e in user.active_enrolments)):

615

elif u'lecturer' in set((e.role for e in user.active_enrolments)):

616

perms.add('edit')

617

perms.add('view')

618

elif u'tutor' in set((e.role for e in user.active_enrolments)):

616

619

perms.add('edit')

617

620

perms.add('view')

618

621

Older »