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
=== modified file 'src/schooltool/gradebook/browser/README.txt'
--- src/schooltool/gradebook/browser/README.txt 2009-07-14 01:24:47 +0000
+++ src/schooltool/gradebook/browser/README.txt 2009-08-25 20:24:41 +0000
@@ -240,6 +240,7 @@
240240
241Now let's change the current worksheet to 'Week 2'.241Now let's change the current worksheet to 'Week 2'.
242242
243 >>> stephan.getLink('Return to Gradebook').click()
243 >>> stephan.getLink('Week 2').click()244 >>> stephan.getLink('Week 2').click()
244 >>> '<span style="font-weight: bold;">Week 2</span>' in stephan.contents245 >>> '<span style="font-weight: bold;">Week 2</span>' in stephan.contents
245 True246 True
246247
=== modified file 'src/schooltool/gradebook/browser/activity.py'
--- src/schooltool/gradebook/browser/activity.py 2009-06-28 00:30:06 +0000
+++ src/schooltool/gradebook/browser/activity.py 2009-08-25 20:24:41 +0000
@@ -260,7 +260,8 @@
260 mapping={'fullname': self.context.title})260 mapping={'fullname': self.context.title})
261261
262 def nextURL(self):262 def nextURL(self):
263 return absoluteURL(self.context.__parent__, self.request)263 worksheet = self.context.__parent__
264 return absoluteURL(worksheet, self.request) + '/manage.html'
264265
265266
266class LinkedActivityEditView(form.EditForm):267class LinkedActivityEditView(form.EditForm):
267268
=== modified file 'src/schooltool/gradebook/browser/grade_student.pt'
--- src/schooltool/gradebook/browser/grade_student.pt 2009-06-25 05:00:11 +0000
+++ src/schooltool/gradebook/browser/grade_student.pt 2009-08-26 02:49:24 +0000
@@ -2,7 +2,12 @@
2 <body>2 <body>
3 <metal:nothing metal:fill-slot="content-header" />3 <metal:nothing metal:fill-slot="content-header" />
4 <metal:block metal:fill-slot="body">4 <metal:block metal:fill-slot="body">
5 <div metal:use-macro="macro:form" />5 <div metal:use-macro="macro:form">
6 <metal:block metal:fill-slot="extra-info">
7 <input name="nexturl" type="hidden"
8 tal:attributes="value view/nexturl" />
9 </metal:block>
10 </div>
6 </metal:block>11 </metal:block>
7 </body>12 </body>
8</html>13</html>
914
=== modified file 'src/schooltool/gradebook/browser/gradebook.py'
--- src/schooltool/gradebook/browser/gradebook.py 2009-07-29 09:35:08 +0000
+++ src/schooltool/gradebook/browser/gradebook.py 2009-08-26 02:49:24 +0000
@@ -834,6 +834,10 @@
834834
835 def __init__(self, context, request):835 def __init__(self, context, request):
836 super(GradeStudent, self).__init__(context, request)836 super(GradeStudent, self).__init__(context, request)
837 if 'nexturl' in self.request:
838 self.nexturl = self.request['nexturl']
839 else:
840 self.nexturl = self.gradebookURL()
837841
838 def update(self):842 def update(self):
839 self.person = IPerson(self.request.principal)843 self.person = IPerson(self.request.principal)
@@ -859,7 +863,7 @@
859 return863 return
860 prev, next = self.prevNextStudent()864 prev, next = self.prevNextStudent()
861 if prev is not None:865 if prev is not None:
862 url = '%s/%s' % (self.nextURL(), prev.username)866 url = '%s/%s' % (self.gradebookURL(), prev.username)
863 self.request.response.redirect(url)867 self.request.response.redirect(url)
864868
865 @button.buttonAndHandler(_("Next"))869 @button.buttonAndHandler(_("Next"))
@@ -868,12 +872,12 @@
868 return872 return
869 prev, next = self.prevNextStudent()873 prev, next = self.prevNextStudent()
870 if next is not None:874 if next is not None:
871 url = '%s/%s' % (self.nextURL(), next.username)875 url = '%s/%s' % (self.gradebookURL(), next.username)
872 self.request.response.redirect(url)876 self.request.response.redirect(url)
873877
874 @button.buttonAndHandler(_("Cancel"))878 @button.buttonAndHandler(_("Cancel"))
875 def handle_cancel_action(self, action):879 def handle_cancel_action(self, action):
876 self.request.response.redirect(self.nextURL())880 self.request.response.redirect(self.nexturl)
877881
878 def applyData(self):882 def applyData(self):
879 data, errors = self.extractData()883 data, errors = self.extractData()
@@ -902,7 +906,7 @@
902906
903 def applyChanges(self, data):907 def applyChanges(self, data):
904 super(GradeStudent, self).applyChanges(data)908 super(GradeStudent, self).applyChanges(data)
905 self.request.response.redirect(self.nextURL())909 self.request.response.redirect(self.nexturl)
906910
907 def prevNextStudent(self):911 def prevNextStudent(self):
908 gradebook = proxy.removeSecurityProxy(self.context.gradebook)912 gradebook = proxy.removeSecurityProxy(self.context.gradebook)
@@ -943,7 +947,7 @@
943 return _(u'Enter grades for ${fullname}',947 return _(u'Enter grades for ${fullname}',
944 mapping={'fullname': self.context.student.title})948 mapping={'fullname': self.context.student.title})
945949
946 def nextURL(self):950 def gradebookURL(self):
947 return absoluteURL(self.context.gradebook, self.request)951 return absoluteURL(self.context.gradebook, self.request)
948952
949953

Subscribers

People subscribed via source and target branches