From 9025f8370bfa80e80fdd6d9b58b487113a83071c Mon Sep 17 00:00:00 2001
From: Galen Charlton <gmc@equinoxinitiative.org>
Date: Fri, 14 Apr 2017 13:53:16 -0400
Subject: [PATCH] webstaff: chop out "/manage/" from serials routes

Signed-off-by: Galen Charlton <gmc@equinoxinitiative.org>
---
 Open-ILS/src/templates/staff/cat/catalog/t_catalog.tt2         | 2 +-
 Open-ILS/src/templates/staff/serials/{manage => }/index.tt2    | 2 +-
 Open-ILS/src/templates/staff/serials/{manage => }/t_manage.tt2 | 0
 Open-ILS/web/js/ui/default/staff/serials/{manage => }/app.js   | 8 ++++----
 4 files changed, 6 insertions(+), 6 deletions(-)
 rename Open-ILS/src/templates/staff/serials/{manage => }/index.tt2 (94%)
 rename Open-ILS/src/templates/staff/serials/{manage => }/t_manage.tt2 (100%)
 rename Open-ILS/web/js/ui/default/staff/serials/{manage => }/app.js (81%)

diff --git a/Open-ILS/src/templates/staff/cat/catalog/t_catalog.tt2 b/Open-ILS/src/templates/staff/cat/catalog/t_catalog.tt2
index f908d84627..b09436e0b1 100644
--- a/Open-ILS/src/templates/staff/cat/catalog/t_catalog.tt2
+++ b/Open-ILS/src/templates/staff/cat/catalog/t_catalog.tt2
@@ -21,7 +21,7 @@
        [% l('Back To Results') %] ( {{ search_result_index }} / {{ search_result_hit_count }} )
     </button>
     <!-- FIXME placeholder -->
-    <a target="_self" href="./serials/manage/{{record_id}}">Manage Subscriptions</a>
+    <a target="_self" href="./serials/{{record_id}}">Manage Subscriptions</a>
   </div>
   <div class="col-md-4">
     <button type="button" class="btn btn-default" ng-click="selectedHoldingsVolCopyAdd()">
diff --git a/Open-ILS/src/templates/staff/serials/manage/index.tt2 b/Open-ILS/src/templates/staff/serials/index.tt2
similarity index 94%
rename from Open-ILS/src/templates/staff/serials/manage/index.tt2
rename to Open-ILS/src/templates/staff/serials/index.tt2
index 1b36a486fd..9eaa08f5a2 100644
--- a/Open-ILS/src/templates/staff/serials/manage/index.tt2
+++ b/Open-ILS/src/templates/staff/serials/index.tt2
@@ -6,7 +6,7 @@
 
 [% BLOCK APP_JS %]
 <script src="[% ctx.media_prefix %]/js/ui/default/staff/services/grid.js"></script>
-<script src="[% ctx.media_prefix %]/js/ui/default/staff/serials/manage/app.js"></script>
+<script src="[% ctx.media_prefix %]/js/ui/default/staff/serials/app.js"></script>
 <script src="[% ctx.media_prefix %]/js/ui/default/staff/cat/services/record.js"></script>
 
 [% END %]
diff --git a/Open-ILS/src/templates/staff/serials/manage/t_manage.tt2 b/Open-ILS/src/templates/staff/serials/t_manage.tt2
similarity index 100%
rename from Open-ILS/src/templates/staff/serials/manage/t_manage.tt2
rename to Open-ILS/src/templates/staff/serials/t_manage.tt2
diff --git a/Open-ILS/web/js/ui/default/staff/serials/manage/app.js b/Open-ILS/web/js/ui/default/staff/serials/app.js
similarity index 81%
rename from Open-ILS/web/js/ui/default/staff/serials/manage/app.js
rename to Open-ILS/web/js/ui/default/staff/serials/app.js
index 72fc8d776f..5936333451 100644
--- a/Open-ILS/web/js/ui/default/staff/serials/manage/app.js
+++ b/Open-ILS/web/js/ui/default/staff/serials/app.js
@@ -13,14 +13,14 @@ angular.module('egSerialsApp', ['ui.bootstrap','ngRoute','egCoreMod','egGridMod'
 
     var resolver = {delay : function(egStartup) {return egStartup.go()}};
 
-    $routeProvider.when('/serials/manage/:bib_id', {
-        templateUrl: './serials/manage/t_manage',
+    $routeProvider.when('/serials/:bib_id', {
+        templateUrl: './serials/t_manage',
         controller: 'ManageCtrl',
         resolve : resolver
     });
 
-    $routeProvider.when('/serials/manage/:bib_id/:active_tab', {
-        templateUrl: './serials/manage/t_manage',
+    $routeProvider.when('/serials/:bib_id/:active_tab', {
+        templateUrl: './serials/t_manage',
         controller: 'ManageCtrl',
         resolve : resolver
     });
-- 
2.11.0