Changeset 9645

Timestamp:

16 Nov 2012, 10:17:52 (12 years ago)

Author:

Henrik Bettermann

Message:

Add permission to roles.

Show user id on reports page.

Show reports of all users (to be discussed).

Location:

main/waeup.kofa/trunk/src/waeup/kofa

Files:

• browser/reports.py (modified) (1 diff)
• browser/templates/reportscontainerpage.pt (modified) (2 diffs)
• permissions.py (modified) (2 diffs)
• reports.py (modified) (2 diffs)
• tests/test_reports.py (modified) (1 diff)

main/waeup.kofa/trunk/src/waeup/kofa/browser/reports.py

@@ -45 +45 @@
     def update(self, job_id=None, DISCARD=None, DOWNLOAD=None):
         self.entries = []
-        user_id = self.request.principal.id
+        #user_id = self.request.principal.id
         if job_id and DISCARD:
             entry = self.context.report_entry_from_job_id(job_id)
             self.context.delete_report_entry(entry)
             self.flash('Report discarded: %s' % job_id)
-        self.entries = self.context.get_report_jobs_description(user_id)
+        self.entries = self.context.get_report_jobs_description()
         if job_id and DOWNLOAD:
             self.redirect(self._report_url(job_id))

main/waeup.kofa/trunk/src/waeup/kofa/browser/templates/reportscontainerpage.pt

@@ -5 +5 @@
         <th i18n:translate="">Report Number</th>
         <th i18n:translate="">Description</th>
+        <th i18n:translate="">Creator</th>
         <th i18n:translate="">Creation Date</th>
         <th i18n:translate="">Status</th>
@@ -17 +18 @@
         <td>
           <span tal:replace="python: entry[1]">REPORT DESCRIPTION</span>
+        </td>
+        <td>
+          <span tal:replace="python: entry[6]">CREATOR</span>
         </td>
         <td nowrap>

main/waeup.kofa/trunk/src/waeup/kofa/permissions.py

@@ -227 +227 @@
                      'waeup.loginAsStudent',
                      'waeup.manageReports',
+                     'waeup.manageJobs',
                      )
 
@@ -255 +256 @@
                      #'waeup.loginAsStudent',
                      'waeup.manageReports',
+                     #'waeup.manageJobs',
                      )
 

main/waeup.kofa/trunk/src/waeup/kofa/reports.py

@@ -154 +154 @@
 
     def get_report_jobs_description(user_id=None):
-        """Get running/completed report jobs fur `user_id` as list of tuples.
+        """Get running/completed report jobs for `user_id` as list of tuples.
 
         The results contain enough information to render a status page
@@ -490 +490 @@
                 continue
             result.append((job_id, job.description, status,
-                           discardable, downloadable, starttime),)
+                           discardable, downloadable, starttime, user_name),)
         return result
 

main/waeup.kofa/trunk/src/waeup/kofa/tests/test_reports.py

@@ -395 +395 @@
         self.assertEqual(
             result,
-            [('2', 'Report 1 ()', u'running', False, False, None),]
+            [('2', 'Report 1 ()', u'running', False, False, None, 'bob'),]
             )
         return