From 577361730ac72106362b483bbfa00dcf3997e0a4 Mon Sep 17 00:00:00 2001
From: Galen Charlton <gmc@equinoxinitiative.org>
Date: Mon, 13 Feb 2017 10:44:07 -0500
Subject: [PATCH] tweak Booking administration pagse

- remove admin/booking/conify/* routes in favor of
  admin/server/booking/* routes that already existed;
  as part of this, remove redudant admin EmbedBookingCtl
  controller
- alphabetize the entries on the Booking Administration splash
  page
- remove Booking links from the Server Administration splash
  page

Signed-off-by: Galen Charlton <gmc@equinoxinitiative.org>
Signed-off-by: Kathy Lussier <klussier@masslnc.org>
---
 .../staff/admin/booking/t_splash.tt2          | 10 ++---
 .../templates/staff/admin/server/t_splash.tt2 |  5 ---
 .../js/ui/default/staff/admin/booking/app.js  | 44 -------------------
 3 files changed, 5 insertions(+), 54 deletions(-)

diff --git a/Open-ILS/src/templates/staff/admin/booking/t_splash.tt2 b/Open-ILS/src/templates/staff/admin/booking/t_splash.tt2
index fcd79e809a..f51ea00cd0 100644
--- a/Open-ILS/src/templates/staff/admin/booking/t_splash.tt2
+++ b/Open-ILS/src/templates/staff/admin/booking/t_splash.tt2
@@ -9,11 +9,11 @@
 
 [%
     interfaces = [
-     [ l('Resource Attribute Maps'), "./admin/booking/conify/resource_attr_map" ]
-    ,[ l('Resource Attribute Values'), "./admin/booking/conify/resource_attr_value" ]
-    ,[ l('Resource Attributes'), "./admin/booking/conify/resource_attr" ]
-    ,[ l('Resource Types'), "./admin/booking/conify/resource_type" ]
-    ,[ l('Resources'), "./admin/booking/conify/resource" ]
+     [ l('Resources'), "./admin/server/booking/resource" ]
+    ,[ l('Resource Attribute Maps'), "./admin/server/booking/resource_attr_map" ]
+    ,[ l('Resource Attribute Values'), "./admin/server/booking/resource_attr_value" ]
+    ,[ l('Resource Attributes'), "./admin/server/booking/resource_attr" ]
+    ,[ l('Resource Types'), "./admin/server/booking/resource_type" ]
    ];
 
    USE table(interfaces, cols=3);
diff --git a/Open-ILS/src/templates/staff/admin/server/t_splash.tt2 b/Open-ILS/src/templates/staff/admin/server/t_splash.tt2
index 193212030b..5d8bf43107 100644
--- a/Open-ILS/src/templates/staff/admin/server/t_splash.tt2
+++ b/Open-ILS/src/templates/staff/admin/server/t_splash.tt2
@@ -17,11 +17,6 @@
     ,[ l('Authority Thesauri'), "./admin/server/cat/authority/thesaurus" ]
     ,[ l('Best-Hold Selection Sort Order'), "./admin/server/config/best_hold_order" ]
     ,[ l('Billing Types'), "./admin/server/config/billing_type" ]
-    ,[ l('Booking Resource Attribute Maps'), "./admin/server/booking/resource_attr_map" ]
-    ,[ l('Booking Resource Attribute Values'), "./admin/server/booking/resource_attr_value" ]
-    ,[ l('Booking Resource Attributes'), "./admin/server/booking/resource_attr" ]
-    ,[ l('Booking Resource Types'), "./admin/server/booking/resource_type" ]
-    ,[ l('Booking Resources'), "./admin/server/booking/resource" ]
     ,[ l('Call Number Prefixes'), "./admin/server/config/acn_prefix" ]
     ,[ l('Call Number Suffixes'), "./admin/server/config/acn_suffix" ]
     ,[ l('Circulation Duration Rules'), "./admin/server/config/rule_circ_duration" ]
diff --git a/Open-ILS/web/js/ui/default/staff/admin/booking/app.js b/Open-ILS/web/js/ui/default/staff/admin/booking/app.js
index 6f12e09502..46f54d834e 100644
--- a/Open-ILS/web/js/ui/default/staff/admin/booking/app.js
+++ b/Open-ILS/web/js/ui/default/staff/admin/booking/app.js
@@ -8,53 +8,9 @@ angular.module('egBookingAdmin',
     $compileProvider.aHrefSanitizationWhitelist(/^\s*(https?|blob):/); 
     var resolver = {delay : function(egStartup) {return egStartup.go()}};
 
-    var eframe_template = 
-        '<eg-embed-frame url="booking_admin_url" handlers="funcs"></eg-embed-frame>';
-
-    $routeProvider.when('/admin/booking/:noun/:verb/:extra?', {
-        template: eframe_template,
-        controller: 'EmbedBookingCtl',
-        resolve : resolver
-    });
-
     // default page 
     $routeProvider.otherwise({
         templateUrl : './admin/booking/t_splash',
         resolve : resolver
     });
 }])
-
-.controller('EmbedBookingCtl',
-       ['$scope','$routeParams','$location','egCore',
-function($scope , $routeParams , $location , egCore) {
-
-    $scope.funcs = {
-        ses : egCore.auth.token(),
-    }
-
-    var booking_path = '/eg/';
-
-    if ($routeParams.noun == 'conify') {
-        booking_path += 'conify/global/booking/' + $routeParams.verb
-            + (typeof $routeParams.extra != 'undefined'
-                ? '/' + $routeParams.extra
-                : '')
-            + location.search;
-    } else {
-        booking_path += 'booking/'
-            + $routeParams.noun + '/' + $routeParams.verb
-            + (typeof $routeParams.extra != 'undefined'
-                ? '/' + $routeParams.extra
-                : '')
-            + location.search;
-    }
-
-    // embed URL must include protocol/domain or it will be loaded via
-    // push-state, resulting in an infinitely nested pages.
-    $scope.booking_admin_url =
-        $location.absUrl().replace(/\/eg\/staff.*/, booking_path);
-
-    console.log('Loading Admin Booking URL: ' + $scope.booking_admin_url);
-
-}])
-
-- 
2.43.2