From 2755603bbe6752ee6c1112d1a36f1bd570e5f303 Mon Sep 17 00:00:00 2001
From: Galen Charlton <gmc@esilibrary.com>
Date: Tue, 15 Nov 2016 16:59:21 -0500
Subject: [PATCH] webstaff: fix a couple thinkos is vol/copy template editor

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Kathy Lussier <klussier@masslnc.org>
---
 .../templates/staff/cat/volcopy/t_attr_edit.tt2    |  2 +-
 .../src/templates/staff/cat/volcopy/t_view.tt2     | 46 +++++++++++-----------
 2 files changed, 25 insertions(+), 23 deletions(-)

diff --git a/Open-ILS/src/templates/staff/cat/volcopy/t_attr_edit.tt2 b/Open-ILS/src/templates/staff/cat/volcopy/t_attr_edit.tt2
index f17be8655a..38dde8fe86 100644
--- a/Open-ILS/src/templates/staff/cat/volcopy/t_attr_edit.tt2
+++ b/Open-ILS/src/templates/staff/cat/volcopy/t_attr_edit.tt2
@@ -6,7 +6,7 @@
         <div class="col-md-2">
             <eg-basic-combo-box list="template_name_list" selected="template_name"></eg-basic-combo-box>
         </div>
-        <div class="col-md-1" ng-if="!editTemplates">
+        <div class="col-md-1">
             <button class="btn btn-default " ng-click="applyTemplate(template_name)" type="button">[% l('Apply') %]</button>
         </div>
         <div class="col-md-6">
diff --git a/Open-ILS/src/templates/staff/cat/volcopy/t_view.tt2 b/Open-ILS/src/templates/staff/cat/volcopy/t_view.tt2
index 38ebb53ccb..d033666dcb 100644
--- a/Open-ILS/src/templates/staff/cat/volcopy/t_view.tt2
+++ b/Open-ILS/src/templates/staff/cat/volcopy/t_view.tt2
@@ -12,28 +12,30 @@ eg-navbar {
 
 <!-- tabbed copy data view -->
 
-<ul class="nav nav-tabs" ng-show="!embedded" ng-if="!edit_templates">
-  <li ng-class="{active : tab == 'edit'}">
-    <a ng-click="tab = 'edit'" >[% l('Edit') %]</a>
-  </li>
-  <li ng-class="{active : tab == 'templates'}">
-    <a ng-click="tab = 'templates'" >[% l('Copy Templates') %]</a>
-  </li>
-  <li ng-class="{active : tab == 'defaults'}">
-    <a ng-click="tab = 'defaults'" >[% l('Defaults') %]</a>
-  </li>
-</ul>
-
-<div class="tab-content" ng-if="!edit_templates">
-  <div class="tab-pane active">
-    <div ng-show="tab == 'edit'">
-      <div ng-include="'[% ctx.base_path %]/staff/cat/volcopy/t_edit'"></div>
-    </div>
-    <div ng-show="tab == 'templates'">
-      <eg-vol-template></eg-vol-template>
-    </div>
-    <div ng-show="tab == 'defaults'">
-      <div ng-include="'[% ctx.base_path %]/staff/cat/volcopy/t_defaults'"></div>
+<div ng-if="!edit_templates">
+  <ul class="nav nav-tabs" ng-show="!embedded">
+    <li ng-class="{active : tab == 'edit'}">
+      <a ng-click="tab = 'edit'" >[% l('Edit') %]</a>
+    </li>
+    <li ng-class="{active : tab == 'templates'}">
+      <a ng-click="tab = 'templates'" >[% l('Copy Templates') %]</a>
+    </li>
+    <li ng-class="{active : tab == 'defaults'}">
+      <a ng-click="tab = 'defaults'" >[% l('Defaults') %]</a>
+    </li>
+  </ul>
+  
+  <div class="tab-content">
+    <div class="tab-pane active">
+      <div ng-show="tab == 'edit'">
+        <div ng-include="'[% ctx.base_path %]/staff/cat/volcopy/t_edit'"></div>
+      </div>
+      <div ng-show="tab == 'templates'">
+        <eg-vol-template></eg-vol-template>
+      </div>
+      <div ng-show="tab == 'defaults'">
+        <div ng-include="'[% ctx.base_path %]/staff/cat/volcopy/t_defaults'"></div>
+      </div>
     </div>
   </div>
 </div>
-- 
2.11.0