Display Owning library in lineitem_details and provide link from lineitem display...

git-svn-id: svn://svn.open-ils.org/ILS/branches/acq-experiment@8997 dcc99617-32d9-48b4-a31d-7c20da2025e4

diff --git a/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/picklist/picklist_summary.html b/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/picklist/picklist_summary.html
index fb37294..f95e384 100644 (file)
--- a/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/picklist/picklist_summary.html
+++ b/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/picklist/picklist_summary.html
@@ -1,14 +1,23 @@
-<div id='oils-acq-picklist-header'>
-    ${_('Picklist')} <span id='oils-acq-picklist-name'>${c.oils.acq.picklist.value.name()}</span>
-    <div class='oils-acq-picklist-attributes'>
-        <%
-        meta = _("Create date: %(date)s") % {"date":c.oils.acq.picklist.value.create_time()}
-        meta2 = _("Last updated: %(date)s") % {"date":c.oils.acq.picklist.value.edit_time()}
-       meta3 = _("Selector: %(owner)s") % {"owner":c.oils.acq.picklist.value.owner()}
-        %>
-        <div>${meta}</div>
-        <div>${meta2}</div>
-       <div>${meta3}</div>
+<%def name='summary(picklist, link=False)'>
+    <div id='oils-acq-picklist-header'>
+        ${_('Picklist')}
+       <span id='oils-acq-picklist-name'>
+           %if link:
+               <A href="${c.oils.acq.prefix.value}/picklist/view/${picklist.id()}">
+           %endif
+                   ${picklist.name()}</span>
+           %if link:
+               </A>
+           %endif
+       <div class='oils-acq-picklist-attributes'>
+            <%
+               meta = _("Create date: %(date)s") % {"date":picklist.create_time()}
+               meta2 = _("Last updated: %(date)s") % {"date":picklist.edit_time()}
+              meta3 = _("Selector: %(owner)s") % {"owner":picklist.owner()}
+            %>
+            <div>${meta}</div>
+            <div>${meta2}</div>
+           <div>${meta3}</div>
+       </div>
     </div>
-</div>
-
+</%def>

diff --git a/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/picklist/view.html b/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/picklist/view.html
index d409f4d..c013e88 100644 (file)
--- a/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/picklist/view.html
+++ b/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/picklist/view.html
@@ -4,17 +4,17 @@
 -->
 <%inherit file='../base.html'/>
 <%namespace file='../../common/widgets.html' name='widget' />
-
+<%namespace file='picklist_summary.html' name='picklist' />
 <%def name="page_title()">${_('Picklist')}</%def>
 <%def name="block_content()">
 
-<%include file='picklist_summary.html'/>
-
 <%
     import oilsweb.lib.bib
     from oilsweb.lib.acq.picklist import PicklistMgr
 %>
 
+${picklist.summary(c.oils.acq.picklist.value)}
+
 <div id='oils-acq-picklist-header-block'>
     <div class='spacer'>&nbsp;</div>
     <div id="oils-acq-picklist-paging-block">

diff --git a/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/picklist/view_lineitem.html b/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/picklist/view_lineitem.html
index ff139c6..d1776a3 100644 (file)
--- a/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/picklist/view_lineitem.html
+++ b/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/picklist/view_lineitem.html
@@ -1,9 +1,12 @@
 # -*- coding: utf-8 -*-
 <%inherit file='../base.html'/>
+<%namespace file='picklist_summary.html' name='picklist' />
+
 <%def name="page_title()">${_('Evergreen Picklist Entry')}</%def>
 <%def name="block_content()">
 
-<%include file='picklist_summary.html'/>
+${picklist.summary(c.oils.acq.picklist.value, link=True)}
+
 <%include file='lineitem_summary.html'/>
 
 <%
@@ -43,7 +46,7 @@
 
 <table id="oils-acq-lineitem-details-table">
     <thead>
-        <tr><td>Fund</td><td>Location</td><td>Selector</td><td>&nbsp;</td></tr>
+        <tr><td>Fund</td><td>Home Library</td></tr>
     </thead>
     <tbody>
         % for detail in c.oils.acq.lineitem.value.lineitem_details():
@@ -59,8 +62,7 @@
                        ${fund_selection(detail.fund())}
                    </form>
                </td>
-               <td>LOCATION</td>
-               <td>SELECTOR</td>
+               <td>${detail.owning_lib() or '&nbsp;'}</td>
            </tr>
        % endfor
     </tbody>

diff --git a/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/picklist/view_list.html b/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/picklist/view_list.html
index 8d8bb7c..b810f61 100644 (file)
--- a/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/picklist/view_list.html
+++ b/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/picklist/view_list.html
@@ -15,7 +15,7 @@
     <thead>
         <tr>
             <td>${_('Name')}</td>
-            <td>${_('Creation Date')}</td>
+            <td>${_('Selector')}</td>
             <td>${_('Edit Date')}</td>
             <td>${_('Number of Entries')}</td>
             <td/>
@@ -26,7 +26,7 @@
     % for picklist in c.oils.acq.picklist_list.value:
     <tr>
         <td><a href='${c.oils.acq.prefix.value}/picklist/view/${picklist.id()}'>${picklist.name()}</a></td>
-        <td>${picklist.create_time()}</td>
+        <td>${picklist.owner()}</td>
         <td>${picklist.edit_time()}</td>
         <td>${picklist.entry_count()}</td>
         <td><a href='${c.oils.acq.prefix.value}/picklist/delete/${picklist.id()}'>${_('Delete')}</a></td>