From 219febda759082def42be99b9cbcaffabc313661 Mon Sep 17 00:00:00 2001 From: Galen Charlton Date: Wed, 5 Jul 2017 15:35:00 -0400 Subject: [PATCH] webstaff serials: pattern wizard shows 'share as' widgets conditionally Signed-off-by: Galen Charlton --- Open-ILS/src/templates/staff/serials/t_pattern_editor_dialog.tt2 | 4 +++- Open-ILS/src/templates/staff/serials/t_prediction_wizard.tt2 | 2 +- Open-ILS/web/js/ui/default/staff/admin/serials/pattern_template.js | 1 + .../js/ui/default/staff/serials/directives/prediction_wizard.js | 7 ++++++- 4 files changed, 11 insertions(+), 3 deletions(-) diff --git a/Open-ILS/src/templates/staff/serials/t_pattern_editor_dialog.tt2 b/Open-ILS/src/templates/staff/serials/t_pattern_editor_dialog.tt2 index a42db7415a..d34f5a0a9e 100644 --- a/Open-ILS/src/templates/staff/serials/t_pattern_editor_dialog.tt2 +++ b/Open-ILS/src/templates/staff/serials/t_pattern_editor_dialog.tt2 @@ -7,7 +7,9 @@ diff --git a/Open-ILS/src/templates/staff/serials/t_prediction_wizard.tt2 b/Open-ILS/src/templates/staff/serials/t_prediction_wizard.tt2 index df52a2cb95..78c2ac780a 100644 --- a/Open-ILS/src/templates/staff/serials/t_prediction_wizard.tt2 +++ b/Open-ILS/src/templates/staff/serials/t_prediction_wizard.tt2 @@ -425,7 +425,7 @@
-
+
diff --git a/Open-ILS/web/js/ui/default/staff/admin/serials/pattern_template.js b/Open-ILS/web/js/ui/default/staff/admin/serials/pattern_template.js index 3b9c5280c5..603ecc3349 100644 --- a/Open-ILS/web/js/ui/default/staff/admin/serials/pattern_template.js +++ b/Open-ILS/web/js/ui/default/staff/admin/serials/pattern_template.js @@ -42,6 +42,7 @@ function($scope , $q , $timeout , $location , $window , $uibModal , egCore , egG controller: ['$scope', '$uibModalInstance', function($scope, $uibModalInstance) { $scope.focusMe = true; + $scope.showShare = false; $scope.patternCode = pred.pattern_code; $scope.ok = function(patternCode) { $uibModalInstance.close(patternCode) } $scope.cancel = function () { $uibModalInstance.dismiss() } diff --git a/Open-ILS/web/js/ui/default/staff/serials/directives/prediction_wizard.js b/Open-ILS/web/js/ui/default/staff/serials/directives/prediction_wizard.js index 78e1e5f29d..ff6002b28e 100644 --- a/Open-ILS/web/js/ui/default/staff/serials/directives/prediction_wizard.js +++ b/Open-ILS/web/js/ui/default/staff/serials/directives/prediction_wizard.js @@ -6,7 +6,8 @@ angular.module('egSerialsAppDep') restrict: 'E', scope: { patternCode : '=', - onSave : '=' + onSave : '=', + showShare : '=' }, templateUrl: './serials/t_prediction_wizard', controller: @@ -14,6 +15,10 @@ angular.module('egSerialsAppDep') function($scope , $q , egSerialsCoreSvc , egCore , egGridDataProvider) { $scope.tab = { active : 0 }; + if (angular.isUndefined($scope.showShare)) { + $scope.showShare = true; + } + // for use by ng-value $scope.True = true; $scope.False = false; -- 2.11.0