SchoolTool

Merge lp:~aelkner/schooltool/schooltool.gradebook_august_fixes into lp:~schooltool-owners/schooltool/schooltool.gradebook

  1. schooltool.gradebook_august_fixes
  2. Merge into schooltool.gradebook
Proposed by Alan Elkner
Status: Merged
Merge reported by: Justas Sadzevičius
Merged at revision: not available
Proposed branch: lp:~aelkner/schooltool/schooltool.gradebook_august_fixes
Merge into: lp:~schooltool-owners/schooltool/schooltool.gradebook
Diff against target: None lines
To merge this branch: bzr merge lp:~aelkner/schooltool/schooltool.gradebook_august_fixes
Reviewer Review Type Date Requested Status
Justas Sadzevičius (community) Approve
Review via email: mp+10713@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Justas Sadzevičius (justas.sadzevicius) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/schooltool/gradebook/browser/README.txt'
2--- src/schooltool/gradebook/browser/README.txt 2009-07-14 01:24:47 +0000
3+++ src/schooltool/gradebook/browser/README.txt 2009-08-25 20:24:41 +0000
4@@ -240,6 +240,7 @@
5
6 Now let's change the current worksheet to 'Week 2'.
7
8+ >>> stephan.getLink('Return to Gradebook').click()
9 >>> stephan.getLink('Week 2').click()
10 >>> '<span style="font-weight: bold;">Week 2</span>' in stephan.contents
11 True
12
13=== modified file 'src/schooltool/gradebook/browser/activity.py'
14--- src/schooltool/gradebook/browser/activity.py 2009-06-28 00:30:06 +0000
15+++ src/schooltool/gradebook/browser/activity.py 2009-08-25 20:24:41 +0000
16@@ -260,7 +260,8 @@
17 mapping={'fullname': self.context.title})
18
19 def nextURL(self):
20- return absoluteURL(self.context.__parent__, self.request)
21+ worksheet = self.context.__parent__
22+ return absoluteURL(worksheet, self.request) + '/manage.html'
23
24
25 class LinkedActivityEditView(form.EditForm):
26
27=== modified file 'src/schooltool/gradebook/browser/grade_student.pt'
28--- src/schooltool/gradebook/browser/grade_student.pt 2009-06-25 05:00:11 +0000
29+++ src/schooltool/gradebook/browser/grade_student.pt 2009-08-26 02:49:24 +0000
30@@ -2,7 +2,12 @@
31 <body>
32 <metal:nothing metal:fill-slot="content-header" />
33 <metal:block metal:fill-slot="body">
34- <div metal:use-macro="macro:form" />
35+ <div metal:use-macro="macro:form">
36+ <metal:block metal:fill-slot="extra-info">
37+ <input name="nexturl" type="hidden"
38+ tal:attributes="value view/nexturl" />
39+ </metal:block>
40+ </div>
41 </metal:block>
42 </body>
43 </html>
44
45=== modified file 'src/schooltool/gradebook/browser/gradebook.py'
46--- src/schooltool/gradebook/browser/gradebook.py 2009-07-29 09:35:08 +0000
47+++ src/schooltool/gradebook/browser/gradebook.py 2009-08-26 02:49:24 +0000
48@@ -834,6 +834,10 @@
49
50 def __init__(self, context, request):
51 super(GradeStudent, self).__init__(context, request)
52+ if 'nexturl' in self.request:
53+ self.nexturl = self.request['nexturl']
54+ else:
55+ self.nexturl = self.gradebookURL()
56
57 def update(self):
58 self.person = IPerson(self.request.principal)
59@@ -859,7 +863,7 @@
60 return
61 prev, next = self.prevNextStudent()
62 if prev is not None:
63- url = '%s/%s' % (self.nextURL(), prev.username)
64+ url = '%s/%s' % (self.gradebookURL(), prev.username)
65 self.request.response.redirect(url)
66
67 @button.buttonAndHandler(_("Next"))
68@@ -868,12 +872,12 @@
69 return
70 prev, next = self.prevNextStudent()
71 if next is not None:
72- url = '%s/%s' % (self.nextURL(), next.username)
73+ url = '%s/%s' % (self.gradebookURL(), next.username)
74 self.request.response.redirect(url)
75
76 @button.buttonAndHandler(_("Cancel"))
77 def handle_cancel_action(self, action):
78- self.request.response.redirect(self.nextURL())
79+ self.request.response.redirect(self.nexturl)
80
81 def applyData(self):
82 data, errors = self.extractData()
83@@ -902,7 +906,7 @@
84
85 def applyChanges(self, data):
86 super(GradeStudent, self).applyChanges(data)
87- self.request.response.redirect(self.nextURL())
88+ self.request.response.redirect(self.nexturl)
89
90 def prevNextStudent(self):
91 gradebook = proxy.removeSecurityProxy(self.context.gradebook)
92@@ -943,7 +947,7 @@
93 return _(u'Enter grades for ${fullname}',
94 mapping={'fullname': self.context.student.title})
95
96- def nextURL(self):
97+ def gradebookURL(self):
98 return absoluteURL(self.context.gradebook, self.request)
99
100

Subscribers

People subscribed via source and target branches