From c33bc5438d3383666aaddb43b190c5da5ea8b2b4 Mon Sep 17 00:00:00 2001
From: Adam Bowling <abowling@emeralddata.net>
Date: Fri, 9 Nov 2018 00:35:25 -0500
Subject: [PATCH] Modified Evergreen custom print label toolbox with save
 modifications.

Signed-off-by: Adam Bowling <abowling@emeralddata.net>
Signed-off-by: Chris Sharp <csharp@georgialibraries.org>
---
 Open-ILS/src/templates/staff/cat/printlabels/t_view.tt2 | 2 +-
 Open-ILS/web/js/ui/default/staff/cat/printlabels/app.js | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/Open-ILS/src/templates/staff/cat/printlabels/t_view.tt2 b/Open-ILS/src/templates/staff/cat/printlabels/t_view.tt2
index 880eaed230..ba1590f0bc 100644
--- a/Open-ILS/src/templates/staff/cat/printlabels/t_view.tt2
+++ b/Open-ILS/src/templates/staff/cat/printlabels/t_view.tt2
@@ -243,7 +243,7 @@
                             </div>
                             <div class="eg-print-label-section" ng-if="preview_scope.toolbox_settings.page.dimensions.rows > 1 || preview_scope.toolbox_settings.page.dimensions.columns > 1">
                                 <h4>Starting Position on Label Grid</h4>
-                                <p>Specify the starting row and column where labels should begin printing. Values must not exceed the respective row and column size specified in "Print Grid Size"</p>
+                                <p>Specify the starting <span ng-if="preview_scope.toolbox_settings.feed_option.selected == 'sheet'">row and </span>column where labels should begin printing. Values must not exceed the respective <span ng-if="preview_scope.toolbox_settings.feed_option.selected == 'sheet'">row and </span>column size specified in "Print Grid Size"</p>
                                 <ul>
                                     <li ng-if="preview_scope.toolbox_settings.feed_option.selected === 'sheet'">
                                         <label>Row:</label>
diff --git a/Open-ILS/web/js/ui/default/staff/cat/printlabels/app.js b/Open-ILS/web/js/ui/default/staff/cat/printlabels/app.js
index 9d006b8e3e..cf8e15919c 100644
--- a/Open-ILS/web/js/ui/default/staff/cat/printlabels/app.js
+++ b/Open-ILS/web/js/ui/default/staff/cat/printlabels/app.js
@@ -288,6 +288,13 @@ function ($scope, $q, $window, $routeParams, $location, $timeout, egCore, egNet,
                         egCore.print.fleshPrintScope($scope.preview_scope);
                         $scope.template_changed(); // load the default
                         $scope.rebuild_cn_set();
+                        if ($scope.preview_scope.toolbox_settings && $scope.template_name && $scope.print.template_content) {
+                            var re = /eg\_plt/i;
+                            if (re.test($scope.print.template_content)) {
+                                $scope.applyTemplate($scope.template_name);
+                                $scope.redraw_label_table();
+                            }
+                        }
                     });
 
                 });
@@ -527,6 +534,7 @@ function ($scope, $q, $window, $routeParams, $location, $timeout, egCore, egNet,
             var output = (style ? style.join("\n") : "") + (comments ? comments.join("\n") : "") + table;
             output = output.replace(/\n+/, "\n");
             $scope.print.template_content = output;
+            $scope.save_locally();
         }
     }
 
-- 
2.11.0