← Back to branch summary

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

« back to all changes in this revision

Viewing changes to ivle/database.py

  • Committer: Matt Giuca
  • Date: 2009-12-08 11:43:33 UTC
  • Revision ID: matt.giuca@gmail.com-20091208114333-wjrcukroelgh6m06
Enrolment page: Added a full stop after error messages (confusing when there are several).

Show diffs side-by-side

added added

removed removed

Lines of Context:
ivle/database.py
234
234
        they may do everything. Otherwise they may do nothing.
235
235
        """
236
236
        if user and user.admin or user is self:
237
 
            return set(['view', 'edit', 'submit_project'])
 
237
            return set(['view_public', 'view', 'edit', 'submit_project'])
238
238
        else:
239
 
            return set()
 
239
            return set(['view_public'])
240
240
 
241
241
# SUBJECTS AND ENROLMENTS #
242
242
 
375
375
            if (enrolment and enrolment.role in (u'tutor', u'lecturer')) \
376
376
               or user.admin:
377
377
                perms.add('edit')
 
378
                # XXX Bug #493945 -- should tutors have these permissions?
 
379
                # Potentially move into the next category (lecturer & admin)
 
380
                perms.add('enrol')          # Can see enrolment screen at all
 
381
                perms.add('enrol_student')  # Can enrol students
 
382
            if (enrolment and enrolment.role in (u'lecturer')) or user.admin:
 
383
                perms.add('enrol_tutor')    # Can enrol tutors
 
384
            if user.admin:
 
385
                perms.add('enrol_lecturer') # Can enrol lecturers
378
386
        return perms
379
387
 
380
388
    def get_enrolment(self, user):
391
399
                Enrolment.user_id == User.id,
392
400
                Enrolment.offering_id == self.id,
393
401
                Enrolment.role == role
394
 
                )
 
402
                ).order_by(User.login)
395
403
 
396
404
    @property
397
405
    def students(self):