small pile of fixes.. css, plugged in LI state in retrieve search, added some grid...

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

diff --git a/Open-ILS/web/oilsweb/oilsweb/public/oils/media/css/skin/default.css b/Open-ILS/web/oilsweb/oilsweb/public/oils/media/css/skin/default.css
index 1fbc4ad..e6c3789 100644 (file)
--- a/Open-ILS/web/oilsweb/oilsweb/public/oils/media/css/skin/default.css
+++ b/Open-ILS/web/oilsweb/oilsweb/public/oils/media/css/skin/default.css
@@ -24,7 +24,7 @@ html, body, #oils-base-body-block {
     padding:0;
 }
 
-.invisible { visibility: none; }
+.invisible { visibility: hidden; }
 .hidden { display: none; visibility: hidden; }
 .display { display: block; visibility: visible; }
 

diff --git a/Open-ILS/web/oilsweb/oilsweb/public/oils/media/ui_js/oils/default/acq/receiving/process.js b/Open-ILS/web/oilsweb/oilsweb/public/oils/media/ui_js/oils/default/acq/receiving/process.js
index 5246c71..2f1dd7f 100644 (file)
--- a/Open-ILS/web/oilsweb/oilsweb/public/oils/media/ui_js/oils/default/acq/receiving/process.js
+++ b/Open-ILS/web/oilsweb/oilsweb/public/oils/media/ui_js/oils/default/acq/receiving/process.js
@@ -13,13 +13,16 @@ dojo.require('openils.widget.OrgUnitFilteringSelect');
 var lineitems = [];
 
 function drawForm() {
+    new openils.User().buildPermOrgSelector('VIEW_PURCHASE_ORDER', orderingAgencySelector);
 }
+dojo.addOnLoad(drawForm);
 
 var liReceived;
 function doSearch(values) {
     var search = {
         attr_values : [values.identifier],
         po_agencies : (values.ordering_agency) ? [values.ordering_agency] : null,
+        li_states : ['in-process']
     };
 
     options = {clear_marc:1, flesh_attrs:1};

diff --git a/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/receiving/process.html b/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/receiving/process.html
index dd4615e..722ce5c 100644 (file)
--- a/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/receiving/process.html
+++ b/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/receiving/process.html
@@ -32,8 +32,8 @@
                         <td><label for='ordering_agency'>${_('Ordering Agency')}</label></td>
                         <td>
                             <!-- make it a multi-select ? -->
-                            <select dojoType='dijit.form.FilteringSelect' name='ordering_agency' 
-                                labalAttr='code' searchAttr='code' jsId='orderingAgencySelector'>
+                            <select dojoType="openils.widget.OrgUnitFilteringSelect" jsId='orderingAgencySelector'
+                                searchAttr="shortname" name="ordering_agency" autocomplete="true" labelAttr='shortname'> </select>
                             </select>
                         </td>
                     </tr>

diff --git a/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/common/jubgrid.html b/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/common/jubgrid.html
index 1506331..633d2ec 100644 (file)
--- a/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/common/jubgrid.html
+++ b/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/common/jubgrid.html
@@ -43,6 +43,10 @@ pointing to the JUB model (and store) that you have created.
      activeSizing="1" layoutAlign="client">
 % endif
 
+    <style type='text/css'>
+        .grid_container {width: 100%; height: 100%;}
+    </style>
+
     <script src='${c.oils.core.media_prefix.value}/ui_js/oils/default/common/jubgrid.js'> </script>
     <script src='${c.oils.core.media_prefix.value}/js/dojo/openils/CopyLocation.js'> </script>
     <script type="text/javascript">
@@ -140,8 +144,10 @@ pointing to the JUB model (and store) that you have created.
             </button>
         </div>
 % endif
-        <div structure='JUBGrid.jubGridLayout' jsid='${grid_jsid}' 
-            dojoType='dojox.Grid' id="${domprefix + '-JUB-grid'}">
+        <div dojoType="dijit.layout.ContentPane" class='grid_container'>
+            <div structure='JUBGrid.jubGridLayout' jsid='${grid_jsid}' 
+                dojoType='dojox.Grid' id="${domprefix + '-JUB-grid'}">
+            </div>
         </div>
 % if not hide_details:
     </div>
@@ -192,8 +198,10 @@ pointing to the JUB model (and store) that you have created.
                ${_('Mark Selected Copies Received')}
            </button>
        </div>
-        <div structure='JUBGrid.jubDetailGridLayout' jsid="JUBGrid.jubDetailGrid" dojoType="dojox.Grid"
-            id='${domprefix + "-details-grid"}'>
+           <div dojoType="dijit.layout.ContentPane" class='grid_container'>
+            <div structure='JUBGrid.jubDetailGridLayout' jsid="JUBGrid.jubDetailGrid" dojoType="dojox.Grid"
+                id='${domprefix + "-details-grid"}'>
+            </div>
         </div>
     </div>
 </div>