← 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: 2009-12-08 05:26:00 UTC
  • Revision ID: grantw@unimelb.edu.au-20091208052600-j5jpe25vgjtypex9
Fix missing GroupsView when creating a project set.

Show diffs side-by-side

added added

removed removed

Lines of Context:
ivle/webapp/admin/subject.py
46
46
from ivle.webapp.admin.projectservice import ProjectSetRESTView,\
47
47
                                             ProjectRESTView
48
48
from ivle.webapp.admin.offeringservice import OfferingRESTView
49
 
from ivle.webapp.admin.traversal import (root_to_subject,
 
49
from ivle.webapp.admin.publishing import (root_to_subject,
50
50
            subject_to_offering, offering_to_projectset, offering_to_project,
51
51
            subject_url, offering_url, projectset_url, project_url)
 
52
from ivle.webapp.admin.breadcrumbs import (SubjectBreadcrumb,
 
53
            OfferingBreadcrumb, UserBreadcrumb, ProjectBreadcrumb)
 
54
from ivle.webapp.groups import GroupsView
52
55
 
53
56
class SubjectsView(XHTMLView):
54
57
    '''The view of the list of subjects.'''
139
142
                    project.short_name
140
143
                    )
141
144
 
142
 
    def new_project_url(self, projectset):
143
 
        return "/api/subjects/" + self.context.subject.short_name + "/" +\
144
 
                self.context.semester.year + "/" + \
145
 
                self.context.semester.semester + "/+projectsets/" +\
146
 
                str(projectset.id) + "/+projects/+new"
147
 
    
148
145
    def populate(self, req, ctx):
149
146
        self.plugin_styles[Plugin] = ["project.css"]
150
147
        self.plugin_scripts[Plugin] = ["project.js"]
164
161
        for projectset in self.context.project_sets:
165
162
            settmpl = loader.load(set_fragment)
166
163
            setCtx = Context()
 
164
            setCtx['req'] = req
167
165
            setCtx['projectset'] = projectset
168
 
            setCtx['new_project_url'] = self.new_project_url(projectset)
169
166
            setCtx['projects'] = []
 
167
            setCtx['GroupsView'] = GroupsView
 
168
            setCtx['ProjectSetRESTView'] = ProjectSetRESTView
170
169
 
171
170
            for project in projectset.projects:
172
171
                projecttmpl = loader.load(project_fragment)
173
172
                projectCtx = Context()
 
173
                projectCtx['req'] = req
174
174
                projectCtx['project'] = project
175
 
                projectCtx['project_url'] = self.project_url(projectset, project)
176
175
 
177
176
                setCtx['projects'].append(
178
177
                        projecttmpl.generate(projectCtx))
232
231
             (Project, '+index', ProjectRESTView, 'api'),
233
232
             ]
234
233
 
 
234
    breadcrumbs = {Subject: SubjectBreadcrumb,
 
235
                   Offering: OfferingBreadcrumb,
 
236
                   User: UserBreadcrumb,
 
237
                   Project: ProjectBreadcrumb,
 
238
                   }
 
239
 
235
240
    tabs = [
236
241
        ('subjects', 'Subjects',
237
242
         'View subject content and complete worksheets',