Re-apply fix for Fix for org unit order in OPAC holdings list

diff --git a/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Record.pm b/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Record.pm
index c071c24..fcea78b 100644 (file)
--- a/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Record.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Record.pm
@@ -310,9 +310,19 @@ sub mk_copy_query {
                         where => {id => $org}
                     }
                 }
-            }
-        }};
-    };
+            },
+                join => { 'parent' => { 'class' => 'aou', 'fkey' => 'parent_ou'} }
+        }
+    }
+        } else {
+                $query->{from}->{acp}->{aou} = { join => { 'parent' => { 'class' => 'aou', 'fkey' => 'parent_ou'} } };
+        };
+
+        unshift(@{$query->{order_by}},
+                {
+               class => 'parent', field => 'name'
+               }
+       );
 
     # Unsure if we want these in the shared function, leaving here for now
     unshift(@{$query->{order_by}},