Changeset 1620:feed3e6e37e5 in peach3-core

Timestamp:

02/01/2012 11:13:47 AM (4 months ago)

Author:

eriks

Branch:

core-split

Message:

Made report generators working again

Location:

src/peach3

Files:

• core/report/__init__.py (moved) (moved from src/peach3/core/reports/__init__.py) (3 diffs)
• core/report/course.py (added)
• core/report/submission.py (added)
• models/report.py (modified) (1 diff)
• templates/peach3/report/download_link.html (added)
• urls.py (modified) (1 diff)
• views/report.py (added)

src/peach3/core/report/__init__.py

@@ -49 +49 @@
     def register(self, generator):
         self.lock.acquire()
-        id = self.last_id
+        id = self.last_id #@ReservedAssignment
         self.last_id += 1
         self.lock.release()
@@ -57 +57 @@
         return id
 
-    def get(self, id):
+    def get(self, id): #@ReservedAssignment
         return self.generators[id]
 
@@ -93 +93 @@
                                                            )
 
-        id = self.report.id
+        id = self.report.id #@ReservedAssignment
         if created or (id not in self._thread_by_reportid and not self.report.exists()):
             self._thread_by_reportid[id] = self

src/peach3/models/report.py

@@ -76 +76 @@
     @models.permalink
     def get_absolute_url(self):
-        return ('peach3.report.views.download', [self.id, self.filename])
+        return ('peach3.views.report.download', [self.id, self.filename])
     absolute_url = property(get_absolute_url)
 
     def get_download_html(self):
         from django.template.loader import render_to_string
-        return render_to_string('report/download_link.html', {'report':self})
+        return render_to_string('peach3/report/download_link.html', {'report':self})
     download_html = property(get_download_html)
 

src/peach3/urls.py

@@ -15 +15 @@
     (r'^core/submission/download/(?P<sbid>[^/]*)/(?P<fid>[^/]*)/(?P<name>.*)$', 'submission.download_file'),
     (r'^core/submission/print/(?P<sbid>[^/]*)/(?P<fid>[^/]*)/$', 'submission.print_file'),
+    (r'^core/report/download/(?P<rid>[^/]*)/(?P<filename>[^/]*)$', 'report.download'),
 )