toast, comments, logging

Signed-off-by: Jason Etheridge <jason@esilibrary.com>

diff --git a/Open-ILS/src/templates/staff/admin/actor/org_unit/index.tt2 b/Open-ILS/src/templates/staff/admin/actor/org_unit/index.tt2
index 8959e19..39a51ee 100644 (file)
--- a/Open-ILS/src/templates/staff/admin/actor/org_unit/index.tt2
+++ b/Open-ILS/src/templates/staff/admin/actor/org_unit/index.tt2
@@ -7,6 +7,12 @@
 [% BLOCK APP_JS %]
 <script src="[% ctx.media_prefix %]/js/ui/default/staff/services/ui.js"></script>
 <script src="[% ctx.media_prefix %]/js/ui/default/staff/admin/actor/org_unit/app.js"></script>
+<script>
+  angular.module('egCoreMod').run(['egStrings', function(s) {
+    s.ORG_UPDATE_SUCCESS = "[% l('Org Unit Updated') %]";
+    s.ORG_UPDATE_FAILURE = "[% l('Org Unit Not Updated') %]";
+  }])
+</script>
 <link rel="stylesheet" href="[% ctx.base_path %]/staff/css/admin.css" />
 [% END %]
 

diff --git a/Open-ILS/src/templates/staff/admin/actor/org_unit/t_main_tab.tt2 b/Open-ILS/src/templates/staff/admin/actor/org_unit/t_main_tab.tt2
index 11134b7..2343893 100644 (file)
--- a/Open-ILS/src/templates/staff/admin/actor/org_unit/t_main_tab.tt2
+++ b/Open-ILS/src/templates/staff/admin/actor/org_unit/t_main_tab.tt2
@@ -36,7 +36,7 @@
     <div class="row">
         <div class="col-md-3">
             <button class="form-control" ng-click="reset()">[% l('Reset Form') %]</button>
-            <button class="form-control" ng-click="update()" ng-disabled="orgForm.$invalid">[% l('Update Org') %]</button>
+            <button class="form-control" ng-click="update()" ng-disabled="orgForm.$invalid">[% l('Update Org') %]</button> [% l('NOTE: A server-side "autogen" process is needed to complete updates to the Org Hierarchy.') %]
         </div>
         <div class="col-md-7">
         </div>

diff --git a/Open-ILS/web/js/ui/default/staff/admin/actor/org_unit/app.js b/Open-ILS/web/js/ui/default/staff/admin/actor/org_unit/app.js
index 6d2ebc8..24b6226 100644 (file)
--- a/Open-ILS/web/js/ui/default/staff/admin/actor/org_unit/app.js
+++ b/Open-ILS/web/js/ui/default/staff/admin/actor/org_unit/app.js
@@ -1,5 +1,12 @@
 angular.module('egOrgUnitApp',
-    ['ngRoute', 'ui.bootstrap', 'treeControl', 'egCoreMod', 'egUiMod'])
+    ['ngRoute', 'ui.bootstrap', 'treeControl', 'egCoreMod', 'egUiMod', 'ngToast'])
+
+.config(['ngToastProvider', function(ngToastProvider) {
+  ngToastProvider.configure({
+    verticalPosition: 'bottom',
+    animation: 'fade'
+  });
+}])
 
 .config(function($routeProvider, $locationProvider, $compileProvider) {
     $locationProvider.html5Mode(true);
@@ -24,8 +31,8 @@ angular.module('egOrgUnitApp',
 })
 
 .controller('OrgUnitCtrl',
-       ['$scope','$q','$routeParams','$window','egCore','egOrg',
-function($scope , $q , $routeParams , $window , egCore , egOrg  ) {
+       ['$scope','$q','$routeParams','$window','egCore','egOrg','ngToast',
+function($scope , $q , $routeParams , $window , egCore , egOrg , ngToast ) {
 
     $scope.reset = function() {
         $scope.org = angular.copy($scope.selectedNode);
@@ -92,19 +99,15 @@ function($scope , $q , $routeParams , $window , egCore , egOrg  ) {
         new_org.phone( $scope.org.phone );
         egCore.pcrud.update(new_org).then(
             function(res) { // success
-                console.log('handler1');
-                window.handler1 = res;
                 window.sessionStorage.removeItem('eg.env.aou.tree');
                 egCore.env.load();
                 init(0);
+                ngToast.create(egCore.strings.ORG_UPDATE_SUCCESS);
             },
-            function(res) { // success
-                console.log('handler2');
-                window.handler2 = res;
+            function(res) { // failure
+                ngToast.create(egCore.strings.ORG_UPDATE_FAILURE);
             },
-            function(res) { // error
-                console.log('handler3');
-                window.handler3 = res;
+            function(res) { // progress
             }
         );
     };