[open-ils-commits] r12930 - in trunk/Open-ILS/web: js/ui/default/acq/common templates/default/acq/common (erickson)

svn at svn.open-ils.org svn at svn.open-ils.org
Mon Apr 20 16:36:45 EDT 2009


Author: erickson
Date: 2009-04-20 16:36:41 -0400 (Mon, 20 Apr 2009)
New Revision: 12930

Modified:
   trunk/Open-ILS/web/js/ui/default/acq/common/li_table.js
   trunk/Open-ILS/web/templates/default/acq/common/li_table.tt2
Log:
if the bibs and holdings have already been loaded into the ILS, the marc from the order record is no longer of much use.  by default, let's show the live marc record and give a link to open the marc editor for the live marc record from the lineitem info page

Modified: trunk/Open-ILS/web/js/ui/default/acq/common/li_table.js
===================================================================
--- trunk/Open-ILS/web/js/ui/default/acq/common/li_table.js	2009-04-20 20:35:30 UTC (rev 12929)
+++ trunk/Open-ILS/web/js/ui/default/acq/common/li_table.js	2009-04-20 20:36:41 UTC (rev 12930)
@@ -13,6 +13,8 @@
 dojo.require('openils.widget.AutoFieldWidget');
 dojo.require('dojo.data.ItemFileReadStore');
 dojo.require('openils.widget.ProgressDialog');
+dojo.require('openils.PermaCrud');
+
 dojo.requireLocalization('openils.acq', 'acq');
 var localeStrings = dojo.i18n.getLocalization('openils.acq', 'acq');
 
@@ -354,7 +356,21 @@
 
     this._drawInfo = function(li) {
 
-        acqLitEditMarc.onClick = function() { self.editMarc(li); }
+        acqLitEditOrderMarc.onClick = function() { self.editOrderMarc(li); }
+        acqLitEditILSMarc.onClick = function() { self.editILSMarc(li); }
+
+        if(li.eg_bib_id()) {
+            openils.Util.hide('acq-lit-marc-order-record-label');
+            openils.Util.hide(acqLitEditOrderMarc.domNode);
+            openils.Util.show('acq-lit-marc-real-record-label');
+            openils.Util.show(acqLitEditILSMarc.domNode);
+        } else {
+            openils.Util.show('acq-lit-marc-order-record-label');
+            openils.Util.show(acqLitEditOrderMarc.domNode);
+            openils.Util.hide('acq-lit-marc-real-record-label');
+            openils.Util.hide(acqLitEditILSMarc.domNode);
+        }
+
         this.drawMarcHTML(li);
         this.infoTbody = dojo.byId('acq-lit-info-tbody');
 
@@ -391,10 +407,14 @@
     };
 
     this.drawMarcHTML = function(li) {
+        var params = [null, true, li.marc()];
+        if(li.eg_bib_id()) 
+            params = [li.eg_bib_id(), true];
+
         fieldmapper.standardRequest(
             ['open-ils.search', 'open-ils.search.biblio.record.html'],
             {   async: true,
-                params: [null, true, li.marc()],
+                params: params,
                 oncomplete: function(r) {
                     dojo.byId('acq-lit-marc-div').innerHTML = 
                         openils.Util.readResponse(r);
@@ -813,7 +833,7 @@
         );
     }
 
-    this.editMarc = function(li) {
+    this.editOrderMarc = function(li) {
 
         /*  To run in Firefox directly, must set signed.applets.codebase_principal_support
             to true in about:config */
@@ -845,6 +865,39 @@
     }
 
 
+    this.editILSMarc = function(li) {
+
+        /*  To run in Firefox directly, must set signed.applets.codebase_principal_support
+            to true in about:config */
+
+        netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect');
+        win = window.open('/xul/server/cat/marcedit.xul'); // XXX version?
+
+        var bib = new openils.PermaCrud().retrieve('bre', li.eg_bib_id());
+
+        var self = this;
+        win.xulG = {
+            record : {marc : li.marc()},
+            save : {
+                label: 'Save Record', // XXX I18N
+                func: function(xmlString) {
+                    bib.marc(xmlString);
+                    fieldmapper.standardRequest(
+                        ['open-ils.cat', 'open-ils.cat.biblio.record_entry.update'],
+                        {   async: true,
+                            params: [openils.User.authtoken, bib],
+                            oncomplete: function(r) {
+                                openils.Util.readResponse(r);
+                                win.close();
+                                self.drawInfo(li.id())
+                            }
+                        }
+                    );
+                },
+            }
+        };
+    }
+
     this._savePl = function(values) {
         var self = this;
         var selected = this.getSelected( (values.which == 'all') );

Modified: trunk/Open-ILS/web/templates/default/acq/common/li_table.tt2
===================================================================
--- trunk/Open-ILS/web/templates/default/acq/common/li_table.tt2	2009-04-20 20:35:30 UTC (rev 12929)
+++ trunk/Open-ILS/web/templates/default/acq/common/li_table.tt2	2009-04-20 20:36:41 UTC (rev 12930)
@@ -16,11 +16,13 @@
                                             <option mask='sr' value='save_picklist'>Save Items To Selection List</option>
                                             <option mask='pl' value='selector_ready'>Mark Ready for Selector</option>
                                             <option mask='pl' value='order_ready'>Mark Ready for Order</option>
-                                            <option mask='pl' value='create_order'>Create Purchase Order</option>
+                                            <option mask='po' value='' disabled='disabled'>------</option>
+                                            <option mask='po' value='create_order'>Create Purchase Order</option>
                                             <option mask='po' value='receive_po'>Mark Purchase Order as Received</option>
                                             <option mask='po' value='rollback_receive_po'>Un-Receive Purchase Order</option>
                                             <option mask='po' value='print_po'>Print Purchase Order</option>
-                                            <option mask='po' value='create_assets'>Create PO Assets</option>
+                                            <option mask='po' value='create_assets'>Load Bibs and Items</option>
+                                            <option mask='po' value='' disabled='disabled'>------</option>
                                             <option mask='*'  value='delete_selected'>Delete Selected Items</option>
                                         </select>
                                     </span>
@@ -104,9 +106,11 @@
             View in the <a href='/opac/en-US/skin/default/xml/rdetail.xml?r='>Catalog</a>
         </div>
         <div style='margin-top:40px;'>
-            <h3>MARC Record</h3>
+            <h3 id='acq-lit-marc-order-record-label'>MARC Order Record</h3>
+            <h3 id='acq-lit-marc-real-record-label'>MARC ILS Record</h3>
             <div>
-                <div dojoType='dijit.form.Button' jsId='acqLitEditMarc'>Edit MARC Record</div>
+                <div dojoType='dijit.form.Button' jsId='acqLitEditOrderMarc'>Edit MARC Order Record</div>
+                <div dojoType='dijit.form.Button' jsId='acqLitEditILSMarc'>Edit MARC ILS Record</div>
             </div>
             <div id='acq-lit-marc-div' style='margin-top:20px;'> </div>
         </div>



More information about the open-ils-commits mailing list