From b2450f27709a3ab21db483f406c1690afd2ecbce Mon Sep 17 00:00:00 2001
From: Dan Pearl <dpearl@cwmars.org>
Date: Fri, 15 Mar 2013 14:24:41 -0400
Subject: [PATCH] Support explicit sort order for labels to be applied before
 label_sortkey

---
 .../lib/OpenILS/Application/Search/Biblio.pm       |  2 +-
 Open-ILS/src/sql/Pg/parts-sorting.sql              |  2 +-
 .../conify/global/biblio/monograph_part.tt2        | 32 +++++++++++++---------
 .../staff_client/server/cat/volume_copy_creator.js |  4 +--
 4 files changed, 23 insertions(+), 17 deletions(-)

diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Application/Search/Biblio.pm b/Open-ILS/src/perlmods/lib/OpenILS/Application/Search/Biblio.pm
index 434e326aa9..219c2410f3 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/Application/Search/Biblio.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/Application/Search/Biblio.pm
@@ -2535,7 +2535,7 @@ sub rec_hold_parts {
                 }
             }
         },
-        order_by =>[{class=>'bmp', field=>'label_sortkey'}]
+        order_by =>[{class=>'bmp', field=>'sort_order'},{class=>'bmp', field=>'label_sortkey'}]
     };
 
     if(defined $pickup_lib) {
diff --git a/Open-ILS/src/sql/Pg/parts-sorting.sql b/Open-ILS/src/sql/Pg/parts-sorting.sql
index b0858c0910..343b76ceab 100644
--- a/Open-ILS/src/sql/Pg/parts-sorting.sql
+++ b/Open-ILS/src/sql/Pg/parts-sorting.sql
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012  C/W MARS Inc.
+ * Copyright (C) 2013  C/W MARS Inc.
  * Daniel Pearl <dpearl@cwmars.org>
  *
  * This program is free software; you can redistribute it and/or
diff --git a/Open-ILS/src/templates/conify/global/biblio/monograph_part.tt2 b/Open-ILS/src/templates/conify/global/biblio/monograph_part.tt2
index b50420082b..5fb230a1ee 100644
--- a/Open-ILS/src/templates/conify/global/biblio/monograph_part.tt2
+++ b/Open-ILS/src/templates/conify/global/biblio/monograph_part.tt2
@@ -1,24 +1,30 @@
 [% WRAPPER base.tt2 %]
 [% ctx.page_title = l('Configure Monograph Parts') %]
-<div dojoType="dijit.layout.ContentPane" layoutAlign="client">
-    <div dojoType="dijit.layout.ContentPane" layoutAlign="top" class='oils-header-panel'>
-        <div>[% l('Monograph Parts') %]</div>
-        <div>
-            <button dojoType='dijit.form.Button' onClick='monoPartGrid.showCreateDialog()'>[% l('New Monograph Part') %]</button>
-            <button dojoType='dijit.form.Button' onClick='monoPartGrid.deleteSelected()'>[% l('Delete Selected') %]</button>
+    <div dojoType="dijit.layout.BorderContainer" design="headline" >
+
+        <div dojoType="dijit.layout.ContentPane" layoutAlign="top" class='oils-header-panel' region="top" style="height:30px;">
+            <div>[% l('Monograph Parts') %]</div>
+
+            <div>
+               <button dojoType='dijit.form.Button' onClick='monoPartGrid.showCreateDialog()'>[% l('New Monograph Part') %]</button>
+               <button dojoType='dijit.form.Button' onClick='monoPartGrid.deleteSelected()'>[% l('Delete Selected') %]</button>
+               &nbsp;&nbsp;
+            </div>
         </div>
-    </div>
-    <div>
-    <table  jsId="monoPartGrid"
+     <div id="sortContentPane" dojoType="dijit.layout.ContentPane" layoutAlign="client" region="center" style="width:500px;overflow-x:hidden;">
+       <table id="monoGrid" jsId="monoPartGrid"
             dojoType="openils.widget.AutoGrid"
-            autoHeight='true'
-            fieldOrder="['label']"
+            hidePaginator='true'
+            autoHeight='true' 
+            fieldOrder="['sort_order','label']"
+            displayLimit=0 
             suppressFields="['id','record','label_sortkey']"
             suppressEditFields="['id','label_sortkey']"
             query="{id: null}"
             fmClass='bmp'
             editOnEnter='true'/>
-</div>
+     </div>
+  </div>
 
 <script type="text/javascript">
     dojo.require('openils.CGI');
@@ -29,7 +35,7 @@
     openils.Util.addOnLoad( function() {
         monoPartGrid.overrideEditWidgets.record = new dijit.form.TextBox({"disabled": true});
         monoPartGrid.overrideEditWidgets.record.shove = { create : cgi.param('r') };
-        monoPartGrid.loadAll({order_by : {bmp : 'label'}}, {record : cgi.param('r')});
+        monoPartGrid.loadAll({order_by : [{class : 'bmp', field : 'sort_order'},{class : 'bmp', field : 'label_sortkey'}]}, {record : cgi.param('r')});
     });
 </script>
 [% END %]
diff --git a/Open-ILS/xul/staff_client/server/cat/volume_copy_creator.js b/Open-ILS/xul/staff_client/server/cat/volume_copy_creator.js
index 0b16308cd7..4e6cd97ae6 100644
--- a/Open-ILS/xul/staff_client/server/cat/volume_copy_creator.js
+++ b/Open-ILS/xul/staff_client/server/cat/volume_copy_creator.js
@@ -205,9 +205,9 @@ function my_init() {
 
         dojo.require('openils.PermaCrud');
         g.pcrud = new openils.PermaCrud({'authtoken':ses()});
-        g.parts = g.pcrud.search('bmp',{'record':g.doc_id},{'order_by': { 'bmp' : 'label_sortkey' } });
+        g.parts = g.pcrud.search('bmp',{'record':g.doc_id},{'order_by': [{'class': 'bmp', 'field' : 'sort_order'},
+                                                                         {'class': 'bmp', 'field' : 'label_sortkey'}] });
         g.parts_hash = util.functional.convert_object_list_to_hash( g.parts );
-
         /***********************************************************************************************************/
         /* For the batch drop downs */
 
-- 
2.11.0