Changeset 485673a

Timestamp:

Feb 3, 2010, 4:22:40 AM (15 years ago)

Author:

Alex Dehnert <adehnert@…>

Branches:

master, client

Children:

ce973f1

Parents:

a6806bf

git-author:

Alex Dehnert <adehnert@…> (02/03/10 04:22:40)

git-committer:

Alex Dehnert <adehnert@…> (02/03/10 04:22:40)

Message:

Add list page

Location:

remit

Files:

• finance_core/models.py (modified) (1 diff)
• remit_templates/index.html (modified) (1 diff)
• remit_templates/vouchers/reimbursementrequest_list.html (added)
• settings.py (modified) (1 diff)
• util/__init__.py (added)
• util/templatetags/__init__.py (added)
• util/templatetags/misc.py (added)
• vouchers/models.py (modified) (2 diffs)
• vouchers/urls.py (modified) (1 diff)

remit/finance_core/models.py

@@ -70 +70 @@
         return cls.get_by_path(path)
 
-    def pathstr(self):
-        parent = self.get_parent()
-        if parent:
-            prefix = parent.pathstr() + '.'
+    def pathstr(self, skip=0):
+        if self.depth-1 > skip:
+            parent = self.get_parent()
+            prefix = parent.pathstr(skip=skip) + '.'
         else:
             prefix = ''

remit/remit_templates/index.html

@@ -12 +12 @@
 <ul>
     <li><a href="{% url request_reimbursement %}">Request reimbursement</a></li>
+    {% if perms.vouchers.can_list %}
+    <li><a href="{% url list_requests %}">List requests</a></li>
+    {% endif %}
 </ul>
 

remit/settings.py

@@ -101 +101 @@
     'vouchers',
     'finance_core',
+    'util',
 )
 

remit/vouchers/models.py

@@ -6 +6 @@
 
 APPROVAL_STATES = (
-    ( 0, 'None'),
+    ( 0, 'Pending'),
     ( 1, 'Approved'),
     (-1, 'Rejected'),
@@ -27 +27 @@
     name = models.CharField(max_length=50, verbose_name='short description', )
     description = models.TextField(blank=True, verbose_name='long description', )
+
+    class Meta:
+        permissions = (
+            ('can_list', 'Can list requests',),
+        )
 
     def __unicode__(self, ):

remit/vouchers/urls.py

@@ -1 +1 @@
 from django.conf.urls.defaults import *
+from django.views.generic.list_detail import object_list
+from django.contrib.auth.decorators import permission_required
 import vouchers.views
+import vouchers.models
 
 urlpatterns = patterns('',
-    (r'reimbursement/', 'vouchers.views.select_request_basics', ),
+    url(r'list/', permission_required('vouchers.can_list')(object_list),
+        kwargs={'queryset': vouchers.models.ReimbursementRequest.objects.all()},
+        name='list_requests',
+    ),
+    url(r'reimbursement/', 'vouchers.views.select_request_basics', name='request_reimbursement', ),
     (r'submit/(?P<term>[\d\w-]+)/(?P<committee>[\d\w-]+)/', 'vouchers.views.submit_request', ),
-    (r'review/(?P<object_id>\d+)/', 'vouchers.views.review_request', ),
+    url(r'review/(?P<object_id>\d+)/', 'vouchers.views.review_request', name='review_request', ),
 )