From: Galen Charlton <gmc@equinoxinitiative.org>
Date: Fri, 14 Apr 2017 17:53:16 +0000 (-0400)
Subject: webstaff: chop out "/manage/" from serials routes
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=9025f8370bfa80e80fdd6d9b58b487113a83071c;p=working%2FEvergreen.git

webstaff: chop out "/manage/" from serials routes

Signed-off-by: Galen Charlton <gmc@equinoxinitiative.org>
---

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/index.tt2 b/Open-ILS/src/templates/staff/serials/index.tt2
new file mode 100644
index 0000000000..9eaa08f5a2
--- /dev/null
+++ b/Open-ILS/src/templates/staff/serials/index.tt2
@@ -0,0 +1,17 @@
+[%
+  WRAPPER "staff/base.tt2";
+  ctx.page_title = l("Serials Management"); 
+  ctx.page_app = "egSerialsApp";
+%]
+
+[% 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/app.js"></script>
+<script src="[% ctx.media_prefix %]/js/ui/default/staff/cat/services/record.js"></script>
+
+[% END %]
+
+<div ng-view></div>
+
+[% END %]
+
diff --git a/Open-ILS/src/templates/staff/serials/manage/index.tt2 b/Open-ILS/src/templates/staff/serials/manage/index.tt2
deleted file mode 100644
index 1b36a486fd..0000000000
--- a/Open-ILS/src/templates/staff/serials/manage/index.tt2
+++ /dev/null
@@ -1,17 +0,0 @@
-[%
-  WRAPPER "staff/base.tt2";
-  ctx.page_title = l("Serials Management"); 
-  ctx.page_app = "egSerialsApp";
-%]
-
-[% 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/cat/services/record.js"></script>
-
-[% END %]
-
-<div ng-view></div>
-
-[% END %]
-
diff --git a/Open-ILS/src/templates/staff/serials/manage/t_manage.tt2 b/Open-ILS/src/templates/staff/serials/manage/t_manage.tt2
deleted file mode 100644
index a85c64bb9a..0000000000
--- a/Open-ILS/src/templates/staff/serials/manage/t_manage.tt2
+++ /dev/null
@@ -1,27 +0,0 @@
-<div ng-show="bib_id" class="row col-md-12">
-  <eg-record-summary record-id="bib_id" no-marc-link="true" record="summary_record"></eg-record-summary>
-</div>
-
-<div class="row col-md-12 pad-vert">
-  <div class="col-md-12">
-    <uib-tabset active="active_tab"> 
-      <!-- note that non-numeric index values must be enclosed in single-quotes,
-           otherwise selecting the active table won't work cleanly -->
-      <uib-tab index="'create-subscription'" heading="[% l('Create Subscription') %]">
-        <p>Create Subscription TODO</p>
-      </uib-tab>
-      <uib-tab index="'frequency'" heading="[% l('Frequency') %]">
-        <p>Frequency TODO</p>
-      </uib-tab>
-      <uib-tab index="'view-issues'" heading="[% l('View Issues') %]">
-        <p>View Issues TODO</p>
-      </uib-tab>
-      <uib-tab index="'receive-issues'" heading="[% l('Receive Issues') %]">
-        <p>Receive TODO</p>
-      </uib-tab>
-      <uib-tab index="'bindery'" heading="[% l('Bindery') %]">
-        <p>Bindery TODO</p>
-      </uib-tab>
-    </uib-tabset>
-  </div>
-</div>
diff --git a/Open-ILS/src/templates/staff/serials/t_manage.tt2 b/Open-ILS/src/templates/staff/serials/t_manage.tt2
new file mode 100644
index 0000000000..a85c64bb9a
--- /dev/null
+++ b/Open-ILS/src/templates/staff/serials/t_manage.tt2
@@ -0,0 +1,27 @@
+<div ng-show="bib_id" class="row col-md-12">
+  <eg-record-summary record-id="bib_id" no-marc-link="true" record="summary_record"></eg-record-summary>
+</div>
+
+<div class="row col-md-12 pad-vert">
+  <div class="col-md-12">
+    <uib-tabset active="active_tab"> 
+      <!-- note that non-numeric index values must be enclosed in single-quotes,
+           otherwise selecting the active table won't work cleanly -->
+      <uib-tab index="'create-subscription'" heading="[% l('Create Subscription') %]">
+        <p>Create Subscription TODO</p>
+      </uib-tab>
+      <uib-tab index="'frequency'" heading="[% l('Frequency') %]">
+        <p>Frequency TODO</p>
+      </uib-tab>
+      <uib-tab index="'view-issues'" heading="[% l('View Issues') %]">
+        <p>View Issues TODO</p>
+      </uib-tab>
+      <uib-tab index="'receive-issues'" heading="[% l('Receive Issues') %]">
+        <p>Receive TODO</p>
+      </uib-tab>
+      <uib-tab index="'bindery'" heading="[% l('Bindery') %]">
+        <p>Bindery TODO</p>
+      </uib-tab>
+    </uib-tabset>
+  </div>
+</div>
diff --git a/Open-ILS/web/js/ui/default/staff/serials/app.js b/Open-ILS/web/js/ui/default/staff/serials/app.js
new file mode 100644
index 0000000000..5936333451
--- /dev/null
+++ b/Open-ILS/web/js/ui/default/staff/serials/app.js
@@ -0,0 +1,35 @@
+angular.module('egSerialsApp', ['ui.bootstrap','ngRoute','egCoreMod','egGridMod','ngToast'])
+
+.config(['ngToastProvider', function(ngToastProvider) {
+  ngToastProvider.configure({
+    verticalPosition: 'bottom',
+    animation: 'fade'
+  });
+}])
+
+.config(function($routeProvider, $locationProvider, $compileProvider) {
+    $locationProvider.html5Mode(true);
+    $compileProvider.aHrefSanitizationWhitelist(/^\s*(https?|blob):/); // grid export
+
+    var resolver = {delay : function(egStartup) {return egStartup.go()}};
+
+    $routeProvider.when('/serials/:bib_id', {
+        templateUrl: './serials/t_manage',
+        controller: 'ManageCtrl',
+        resolve : resolver
+    });
+
+    $routeProvider.when('/serials/:bib_id/:active_tab', {
+        templateUrl: './serials/t_manage',
+        controller: 'ManageCtrl',
+        resolve : resolver
+    });
+})
+
+.controller('ManageCtrl',
+       ['$scope','$routeParams','$location','$window','$q',
+function($scope , $routeParams , $location , $window , $q
+) {
+    $scope.bib_id = $routeParams.bib_id;
+    $scope.active_tab = $routeParams.active_tab ?  $routeParams.active_tab : 'create-subscription';
+}])
diff --git a/Open-ILS/web/js/ui/default/staff/serials/manage/app.js b/Open-ILS/web/js/ui/default/staff/serials/manage/app.js
deleted file mode 100644
index 72fc8d776f..0000000000
--- a/Open-ILS/web/js/ui/default/staff/serials/manage/app.js
+++ /dev/null
@@ -1,35 +0,0 @@
-angular.module('egSerialsApp', ['ui.bootstrap','ngRoute','egCoreMod','egGridMod','ngToast'])
-
-.config(['ngToastProvider', function(ngToastProvider) {
-  ngToastProvider.configure({
-    verticalPosition: 'bottom',
-    animation: 'fade'
-  });
-}])
-
-.config(function($routeProvider, $locationProvider, $compileProvider) {
-    $locationProvider.html5Mode(true);
-    $compileProvider.aHrefSanitizationWhitelist(/^\s*(https?|blob):/); // grid export
-
-    var resolver = {delay : function(egStartup) {return egStartup.go()}};
-
-    $routeProvider.when('/serials/manage/:bib_id', {
-        templateUrl: './serials/manage/t_manage',
-        controller: 'ManageCtrl',
-        resolve : resolver
-    });
-
-    $routeProvider.when('/serials/manage/:bib_id/:active_tab', {
-        templateUrl: './serials/manage/t_manage',
-        controller: 'ManageCtrl',
-        resolve : resolver
-    });
-})
-
-.controller('ManageCtrl',
-       ['$scope','$routeParams','$location','$window','$q',
-function($scope , $routeParams , $location , $window , $q
-) {
-    $scope.bib_id = $routeParams.bib_id;
-    $scope.active_tab = $routeParams.active_tab ?  $routeParams.active_tab : 'create-subscription';
-}])