← Back to branch summary

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

« back to all changes in this revision

Viewing changes to ivle/database.py

Merge submissions-subversion-acls.

Offering staff can now use Subversion to access submissions.

Show diffs side-by-side

added added

removed removed

Lines of Context:
ivle/database.py
117
117
 
118
118
    @property
119
119
    def display_name(self):
120
 
        """Returns the "nice name" of the user or group."""
121
120
        return self.fullname
122
121
 
123
122
    @property
124
 
    def short_name(self):
125
 
        """Returns the database "identifier" name of the user or group."""
126
 
        return self.login
127
 
 
128
 
    @property
129
123
    def password_expired(self):
130
124
        fieldval = self.pass_exp
131
125
        return fieldval is not None and datetime.datetime.now() > fieldval
565
559
 
566
560
    @property
567
561
    def display_name(self):
568
 
        """Returns the "nice name" of the user or group."""
569
 
        return self.nick
570
 
 
571
 
    @property
572
 
    def short_name(self):
573
 
        """Returns the database "identifier" name of the user or group."""
574
 
        return self.name
 
562
        return '%s (%s)' % (self.nick, self.name)
575
563
 
576
564
    def get_projects(self, offering=None, active_only=True):
577
565
        '''Find projects that the group can submit.