[Checkins] SVN: Sandbox/luciano/kirbi/src/kirbi/ lending status displays implemented

[Luciano Ramalho]

Log message for revision 79063:
  lending status displays implemented
  

Changed:
  U   Sandbox/luciano/kirbi/src/kirbi/collection.py
  U   Sandbox/luciano/kirbi/src/kirbi/collection_templates/index.pt
  U   Sandbox/luciano/kirbi/src/kirbi/item.py

-=-
Modified: Sandbox/luciano/kirbi/src/kirbi/collection.py
===================================================================
--- Sandbox/luciano/kirbi/src/kirbi/collection.py	2007-08-21 07:57:42 UTC (rev 79062)
+++ Sandbox/luciano/kirbi/src/kirbi/collection.py	2007-08-21 08:32:15 UTC (rev 79063)
@@ -51,7 +51,7 @@
 
     def __init__(self, context, request):
         super(Index, self).__init__(context, request)
-        self.pac = grok.getSite()['pac']
+        self.pac = grok.getSite().pac
 
     def update(self, query=None):
         results = self.context.values()
@@ -70,7 +70,11 @@
                     borrower_login=(self.context.__name__,
                                     self.context.__name__)
                     )
-        return ['%s->%s' % (r.lender_login, r.item_id) for r in res]
+        return [{'lender_login':r.lender_login,
+                 'item_id':r.item_id,
+                 'item_title':self.context.__parent__[r.lender_login][r.item_id].filing_title,
+                 'status':r.status,
+                 } for r in res]
 
     def othersRequests(self):
         catalog = getUtility(ICatalog)
@@ -78,11 +82,15 @@
                     lender_login=(self.context.__name__,
                                     self.context.__name__)
                     )
-        return ['%s->%s' % (r.lender_login, r.item_id) for r in res]
+        return [{'borrower_login':r.borrower_login,
+                 'item_id':r.item_id,
+                 'item_title':self.context[r.item_id].filing_title,
+                 'status':r.status,
+                 } for r in res]
 
 class AddFromPac(grok.View):
     def render(self,manifestation_id,camefrom):
-        pac = grok.getSite()['pac']
+        pac = grok.getSite().pac
         book = pac[manifestation_id]
         item = Item(book.__name__,self.context.__name__)
         self.context.addItem(item)
@@ -93,7 +101,7 @@
     invalid_isbns = []
 
     def update(self, isbns=None, retry_isbns=None, refreshed=False):
-        self.pac = grok.getSite()['pac']
+        self.pac = grok.getSite().pac
         self.invalid_isbns = []
         if isbns is not None:
             if isinstance(isbns, basestring):

Modified: Sandbox/luciano/kirbi/src/kirbi/collection_templates/index.pt
===================================================================
--- Sandbox/luciano/kirbi/src/kirbi/collection_templates/index.pt	2007-08-21 07:57:42 UTC (rev 79062)
+++ Sandbox/luciano/kirbi/src/kirbi/collection_templates/index.pt	2007-08-21 08:32:15 UTC (rev 79063)
@@ -39,9 +39,23 @@
     <td><div class="leases">
         <h2>Leases</h2>
         <h3>Your requests</h3>
-            <span tal:replace="view/yourRequests|string:(none)" />
+            <ul tal:condition="view/yourRequests">
+                <li tal:repeat="req view/yourRequests">
+                    <b>From:</b> <span tal:replace="req/lender_login" />
+                       (<span tal:replace="req/status" />)<br />
+                    <i tal:content="req/item_title" /><br />
+                </li>
+            </ul>
+            <span tal:condition="not:view/yourRequests">none</span>
         <h3>Other's requests</h3>
-            <span tal:replace="view/othersRequests|string:(none)" />
+            <ul tal:condition="view/othersRequests">
+                <li tal:repeat="req view/othersRequests">
+                    <b>To:</b> <span tal:replace="req/borrower_login" />
+                       (<span tal:replace="req/status" />)<br />
+                    <i tal:content="req/item_title" /><br />
+                </li>
+            </ul>
+            <span tal:condition="not:view/othersRequests">none</span>
         </div>
     </td>
     </tr></table>

Modified: Sandbox/luciano/kirbi/src/kirbi/item.py
===================================================================
--- Sandbox/luciano/kirbi/src/kirbi/item.py	2007-08-21 07:57:42 UTC (rev 79062)
+++ Sandbox/luciano/kirbi/src/kirbi/item.py	2007-08-21 08:32:15 UTC (rev 79063)
@@ -49,7 +49,7 @@
         super(Item, self).__init__()
         self.manifestation_id = manifestation_id
         if manifestation_id:
-            self.manifestation = grok.getSite()['pac'].get(manifestation_id)
+            self.manifestation = grok.getSite().pac.get(manifestation_id)
         self.description = description
         self.owner_login = owner_login
         if catalog_datetime is None: