← Back to branch summary

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

« back to all changes in this revision

Viewing changes to ivle/webapp/admin/subject.py

  • Committer: William Grant
  • Date: 2010-02-26 13:27:55 UTC
  • Revision ID: grantw@unimelb.edu.au-20100226132755-6aya9set3q8nkgyv
Tags: 1.0
Bump version to 1.0. This is it.

Show diffs side-by-side

added added

removed removed

Lines of Context:
ivle/webapp/admin/subject.py
735
735
    permission = "view_project_submissions"
736
736
    tab = 'subjects'
737
737
 
738
 
    def build_subversion_url(self, config, submission):
 
738
    def build_subversion_url(self, svnroot, submission):
739
739
        princ = submission.assessed.principal
740
740
 
741
 
        return os.path.join(princ.get_svn_url(config),
742
 
                            submission.path[1:] if
743
 
                                submission.path.startswith(os.sep) else
744
 
                                submission.path)
 
741
        if isinstance(princ, User):
 
742
            path = 'users/%s' % princ.login
 
743
        else:
 
744
            path = 'groups/%s_%s_%s_%s' % (
 
745
                    princ.project_set.offering.subject.short_name,
 
746
                    princ.project_set.offering.semester.year,
 
747
                    princ.project_set.offering.semester.semester,
 
748
                    princ.name
 
749
                    )
 
750
        return urlparse.urljoin(
 
751
                    svnroot,
 
752
                    os.path.join(path, submission.path[1:] if
 
753
                                       submission.path.startswith(os.sep) else
 
754
                                       submission.path))
745
755
 
746
756
    def populate(self, req, ctx):
747
757
        self.plugin_styles[Plugin] = ["project.css"]
753
763
        ctx['format_datetime'] = ivle.date.make_date_nice
754
764
        ctx['format_datetime_short'] = ivle.date.format_datetime_for_paragraph
755
765
        ctx['build_subversion_url'] = self.build_subversion_url
 
766
        ctx['svn_addr'] = req.config['urls']['svn_addr']
756
767
        ctx['project'] = self.context
757
768
        ctx['user'] = req.user
758
769
        ctx['ProjectEdit'] = ProjectEdit