LP 1820741: Cleanup Dan Pearl's Code

Mostly remove conflict markers and some whitespace cleanup.

Signed-off-by: Jason Stephenson <jason@sigio.com>

diff --git a/Open-ILS/src/templates/staff/share/print_templates/t_hold_shelf_slip.tt2 b/Open-ILS/src/templates/staff/share/print_templates/t_hold_shelf_slip.tt2
index 2dd1061..84e22c8 100644 (file)
--- a/Open-ILS/src/templates/staff/share/print_templates/t_hold_shelf_slip.tt2
+++ b/Open-ILS/src/templates/staff/share/print_templates/t_hold_shelf_slip.tt2
@@ -1,18 +1,15 @@
 <!--
 Template for printing hold request slips. Fields include:
 
-<<<<<<< HEAD
 * hold.behind_desk
 * copy.barcode
 * call_number.label
 * call_number.prefix
 * call_number.suffix
-=======
 * copy.barcode
 * copy.call_number.label
 * copy.call_number.prefix.name
 * copy.call_number.suffix.name
->>>>>>> 57e65e1... Interim commit
 * title
 
 * patron.alias

diff --git a/Open-ILS/web/js/ui/default/staff/admin/workstation/app.js b/Open-ILS/web/js/ui/default/staff/admin/workstation/app.js
index cba5e9e..020697d 100644 (file)
--- a/Open-ILS/web/js/ui/default/staff/admin/workstation/app.js
+++ b/Open-ILS/web/js/ui/default/staff/admin/workstation/app.js
@@ -486,13 +486,9 @@ function($scope , $q , egCore , ngToast) {
         // TODO - make this go away
         'call_number.label' : '636.8 JON',
         'call_number.record.simple_record.title' : 'Test Title',
-<<<<<<< HEAD
-        'location.name' : 'General Collection',
         'call_number.owning_lib.name' : 'Ankers Memorial Library',
         'call_number.owning_lib.shortname' : 'Ankers'
-=======
         'location.name' : 'General Collection'
->>>>>>> 5a56beb... LP1823197: Provide call number prefix and suffix on hold shelf slip
     }
 
     var one_hold = {

diff --git a/Open-ILS/web/js/ui/default/staff/circ/patron/checkout.js b/Open-ILS/web/js/ui/default/staff/circ/patron/checkout.js
index ca5cdf9..a70aa13 100644 (file)
--- a/Open-ILS/web/js/ui/default/staff/circ/patron/checkout.js
+++ b/Open-ILS/web/js/ui/default/staff/circ/patron/checkout.js
@@ -319,8 +319,8 @@ function($scope , $q , $routeParams , egCore , egUser , patronSvc ,
                     title : co.title,
                     author : co.author
                 });
-               // Flesh selected fields of this circulation
-                print_data.circulations[0].copy.call_number = 
+                       // Flesh selected fields of this circulation
+                print_data.circulations[0].copy.call_number =
                     egCore.idl.toHash(co.acn);
             };
         });

diff --git a/Open-ILS/web/js/ui/default/staff/circ/patron/items_out.js b/Open-ILS/web/js/ui/default/staff/circ/patron/items_out.js
index ef7ebe2..6f4fee0 100644 (file)
--- a/Open-ILS/web/js/ui/default/staff/circ/patron/items_out.js
+++ b/Open-ILS/web/js/ui/default/staff/circ/patron/items_out.js
@@ -377,8 +377,8 @@ function($scope , $q , $routeParams , $timeout , egCore , egUser , patronSvc ,
                 author : circ.target_copy().call_number().record().wide_display_entry().author()
             })
             // Flesh selected fields of this circulation
-                print_data.circulations[0].copy.call_number = 
-                    egCore.idl.toHash(circ.target_copy().call_number());
+            print_data.circulations[0].copy.call_number =
+                egCore.idl.toHash(circ.target_copy().call_number());
         });
 
         print_data.patron = {

diff --git a/Open-ILS/web/js/ui/default/staff/circ/services/circ.js b/Open-ILS/web/js/ui/default/staff/circ/services/circ.js
index d40eedf..217637a 100644 (file)
--- a/Open-ILS/web/js/ui/default/staff/circ/services/circ.js
+++ b/Open-ILS/web/js/ui/default/staff/circ/services/circ.js
@@ -1813,14 +1813,13 @@ function($uibModal , $q , egCore , egAlertDialog , egConfirmDialog,  egAddCopyAl
             };
 
             // Define prefix and suffix in print_context
-                 
             if (typeof print_context.call_number.prefix == 'object') {
                 print_context.call_number.prefix = "";
             } else {
                 egCore.pcrud.retrieve('acnp', print_context.call_number.prefix)
                     .then(function(p) {
-                        print_context.call_number.prefix = 
-                               egCore.idl.toHash(p).label; 
+                        print_context.call_number.prefix =
+                            egCore.idl.toHash(p).label;
                      })
             }
             if (typeof print_context.call_number.suffix == 'object') {
@@ -1828,8 +1827,8 @@ function($uibModal , $q , egCore , egAlertDialog , egConfirmDialog,  egAddCopyAl
             } else {
                 egCore.pcrud.retrieve('acns', print_context.call_number.suffix)
                     .then(function(s) {
-                        print_context.call_number.suffix = 
-                               egCore.idl.toHash(s).label; 
+                        print_context.call_number.suffix =
+                            egCore.idl.toHash(s).label;
                      })
             }