[open-ils-commits] r17264 - in trunk/Open-ILS/web/js/dojo/openils/acq: . nls (erickson)

[svn at svn.open-ils.org]

Author: erickson
Date: 2010-08-19 11:01:53 -0400 (Thu, 19 Aug 2010)
New Revision: 17264

Modified:
   trunk/Open-ILS/web/js/dojo/openils/acq/Lineitem.js
   trunk/Open-ILS/web/js/dojo/openils/acq/nls/acq.js
Log:
for consistency, use same 'icons' to indicate PO and PL.  don't show PO/PL links when no such object is linked to the lineitem

Modified: trunk/Open-ILS/web/js/dojo/openils/acq/Lineitem.js
===================================================================
--- trunk/Open-ILS/web/js/dojo/openils/acq/Lineitem.js	2010-08-19 14:22:28 UTC (rev 17263)
+++ trunk/Open-ILS/web/js/dojo/openils/acq/Lineitem.js	2010-08-19 15:01:53 UTC (rev 17264)
@@ -144,6 +144,9 @@
                 var orderDate = '';
                 var liLink = '';
 
+                if(pl.name() == '') // special pl
+                    pl = null;
+
                 if(po) {
                     liLink = oilsBasePath + '/acq/po/view/' + po.id() + '/' + lineitem.id();
                     if(po.order_date()) {
@@ -175,7 +178,9 @@
                         lineitem.order_summary().encumbrance_amount() || '0.00',
                         lineitem.order_summary().paid_amount() || '0.00',
                         orderDate,
-                        liLink
+                        liLink,
+                        (po) ? 'foo' : '', // forces class='hiddenfoo' i.e. not hidden
+                        (pl) ? 'foo' : '', // ditto
                     ]
                 );
 

Modified: trunk/Open-ILS/web/js/dojo/openils/acq/nls/acq.js
===================================================================
--- trunk/Open-ILS/web/js/dojo/openils/acq/nls/acq.js	2010-08-19 14:22:28 UTC (rev 17263)
+++ trunk/Open-ILS/web/js/dojo/openils/acq/nls/acq.js	2010-08-19 15:01:53 UTC (rev 17264)
@@ -59,7 +59,7 @@
     "INVOICE_ITEM_DETAILS" : "${0} <br/> ${1} <br/> ${2}. <br/> Estimated Price: $${3}. <br/> Lineitem ID: ${4} <br/> PO: ${5} <br/> Order Date: ${6}",
     "INVOICE_CONFIRM_ITEM_DELETE" : "Remove this $${0} '${1}' charge from the invoice?",
     "INVOICE_CONFIRM_ENTRY_DETACH" : "Remove $${0} charge for item '${1}, ${2} [${3}] from the invoice?",
-    "LINEITEM_SUMMARY" : "<div class='acq-lineitem-summary'><a href='${19}'>${0}</a>, by ${1} (${2})</div>\n<div class='acq-lineitem-summary-extra'>\n${3} Ordered, ${4} Received, ${7} Invoiced, ${8} Claimed, ${9} Cancelled</div>\n<div class='acq-lineitem-summary-extra'>Estimated $${6}, Encumbered $${16}, Paid $${17}</div>\n<div class='acq-lineitem-summary-extra'>\n<a style='padding-right: 10px;' href='${11}/acq/po/view/${12}'>PO #${13} ${18}</a>\n<a style='padding-right: 10px;' href='${11}/acq/picklist/view/${14}'>${15}</a></div>",
+    "LINEITEM_SUMMARY" : "<div class='acq-lineitem-summary'><a href='${19}'>${0}</a>, by ${1} (${2})</div>\n<div class='acq-lineitem-summary-extra'>\n${3} Ordered, ${4} Received, ${7} Invoiced, ${8} Claimed, ${9} Cancelled</div>\n<div class='acq-lineitem-summary-extra'>Estimated $${6}, Encumbered $${16}, Paid $${17}</div>\n<div class='acq-lineitem-summary-extra'>\n<a style='padding-right: 10px;' class='hidden${20}'  href='${11}/acq/po/view/${12}'>&#x2318; ${13} ${18}</a>\n<a style='padding-right: 10px;' class='hidden${21}' href='${11}/acq/picklist/view/${14}'>&#x2756; ${15}</a></div>",
     "INVOICE_CONFIRM_PRORATE" : "Prorate charges?\n\nAny subsequent changes to the invoice that would affect prorated amounts should be resolved manually.",
     "INVOICE_EXTRA_COPIES" : "You are attempting to invoice <b>${0}</b> more copies than originally ordered.  <br/><br/>To add these items to the original order, select a fund and choose 'Add New Items' below.  <br/>After saving the invoice, you may finish editing and importing the new copies from the lineitem details page.",
     "INVOICE_ITEM_PO_DETAILS" : "<b>${0}</b><br/><a href='${1}/acq/po/view/${2}'>PO #${3} ${4}</a><br/>Total Estimated Cost: $${5}",