Addresses LP bug #736167, correctly populate hold format list for Advanced Options

git-svn-id: svn://svn.open-ils.org/ILS/trunk@19778 dcc99617-32d9-48b4-a31d-7c20da2025e4

diff --git a/Open-ILS/web/opac/skin/default/js/holds.js b/Open-ILS/web/opac/skin/default/js/holds.js
index 0e95c40..7ed0eda 100644 (file)
--- a/Open-ILS/web/opac/skin/default/js/holds.js
+++ b/Open-ILS/web/opac/skin/default/js/holds.js
@@ -640,13 +640,6 @@ function holdsGetFormats() {
        var rec = holdArgs.record;
        var mrec = holdArgs.metarecord;
 
-       for( var i = 0; i < desc.length; i++ ) {
-               var d = desc[i];
-               if( type == 'T' && d.item_lang() != lang ) continue;
-               formats.push( _t_f_2_format(d.item_type(), d.item_form()));
-       }
-
-       formats = uniquify(formats);
 
        if( type == 'T') {
 
@@ -659,14 +652,27 @@ function holdsGetFormats() {
                                break;
                        }
                }
+
+       for( var i = 0; i < desc.length; i++ ) {
+               var d = desc[i];
+                   if( type == 'T' && d.item_lang() != lang ) continue;
+               formats.push( _t_f_2_format(d.item_type(), d.item_form()));
+           }
+
        } else if( type =='M') {
 
         // All available formats are selected by default in MR holds
-               for( var i = 0; i < formats.length; i++ ) {
-                       sformats.push(formats[i]);
-               }
+               for( var i = 0; i < desc.length; i++ ) {
+               var d = desc[i];
+                   var _tmp_f = _t_f_2_format(d.item_type(), d.item_form());
+               formats.push( _tmp_f );
+               sformats.push( _tmp_f );
+       }
        }
 
+       formats = uniquify(formats);
+       sformats = uniquify(sformats);
+
        return {
                lang : lang,
                avail_formats : formats,