[open-ils-commits] [GIT] Evergreen ILS branch master updated. 69fedd11d0bc250eb321bb60854e40505aa8473f

[Evergreen Git]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Evergreen ILS".

The branch, master has been updated
       via  69fedd11d0bc250eb321bb60854e40505aa8473f (commit)
      from  1c1ca48007ea044ca39c7bec065faf5557e54ac8 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 69fedd11d0bc250eb321bb60854e40505aa8473f
Author: Kyle Huckins <khuckins at catalystdevworks.com>
Date:   Tue Oct 4 10:26:30 2016 -0700

    LP#1537215 webstaff: require confirmation to delete patron note
    
    Call egConfirmDialog to confirm deletion of
    patron note.
    
    Create strings for Note Deletion.
    
    Signed-off-by: Kyle Huckins <khuckins at catalystdevworks.com>
    
    Conflicts:
    	Open-ILS/web/js/ui/default/staff/circ/patron/app.js
    
    Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>

diff --git a/Open-ILS/src/templates/staff/circ/patron/index.tt2 b/Open-ILS/src/templates/staff/circ/patron/index.tt2
index 0cdc45c..7e16ec4 100644
--- a/Open-ILS/src/templates/staff/circ/patron/index.tt2
+++ b/Open-ILS/src/templates/staff/circ/patron/index.tt2
@@ -47,6 +47,8 @@ angular.module('egCoreMod').run(['egStrings', function(s) {
   s.PAYMENT_WARN_AMOUNT = "[% l('Are you sure you want to apply a payment of $[_1]?', '{{payment_amount}}') %]";
   s.PAYMENT_WARN_AMOUNT_TITLE = "[% l('Verify Payment Amount') %]";
   s.PAYMENT_OVER_MAX = "[% l('Payments over $[_1] are denied by policy.', '{{max_amount}}') %]";
+  s.PATRON_NOTE_DELETE_CONFIRM_TITLE = "[% l('Delete Note?') %]";
+  s.PATRON_NOTE_DELETE_CONFIRM = "[% l('Delete the note titled \"[_1]\" created on [_2]?', '{{note_title}}', '{{create_date | date}}') %]";
 }]);
 </script>
 
diff --git a/Open-ILS/web/js/ui/default/staff/circ/patron/app.js b/Open-ILS/web/js/ui/default/staff/circ/patron/app.js
index 2c94009..1dc380f 100644
--- a/Open-ILS/web/js/ui/default/staff/circ/patron/app.js
+++ b/Open-ILS/web/js/ui/default/staff/circ/patron/app.js
@@ -1357,8 +1357,10 @@ function($scope,  $routeParams , $location , egCore , patronSvc) {
 }])
 
 .controller('PatronNotesCtrl',
-       ['$scope', '$filter', '$routeParams','$location','egCore','patronSvc','$uibModal',
-function($scope,  $filter, $routeParams , $location , egCore , patronSvc , $uibModal) {
+       ['$scope','$filter','$routeParams','$location','egCore','patronSvc','$uibModal',
+        'egConfirmDialog',
+function($scope,  $filter , $routeParams , $location , egCore , patronSvc , $uibModal,
+         egConfirmDialog) {
     $scope.initTab('other', $routeParams.id);
     var usr_id = $routeParams.id;
 
@@ -1405,7 +1407,14 @@ function($scope,  $filter, $routeParams , $location , egCore , patronSvc , $uibM
 
     // delete the selected note
     $scope.deleteNote = function(note) {
-        egCore.pcrud.remove(note).then(function() {refreshPage()});
+        egConfirmDialog.open(
+            egCore.strings.PATRON_NOTE_DELETE_CONFIRM_TITLE, egCore.strings.PATRON_NOTE_DELETE_CONFIRM,
+            {ok : function() {
+                egCore.pcrud.remove(note).then(function() {refreshPage()});
+            },
+            note_title : note.title(),
+            create_date : note.create_date()
+        });
     }
 
     // print the selected note

-----------------------------------------------------------------------

Summary of changes:
 Open-ILS/src/templates/staff/circ/patron/index.tt2 |    2 ++
 .../web/js/ui/default/staff/circ/patron/app.js     |   15 ++++++++++++---
 2 files changed, 14 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
Evergreen ILS