[open-ils-commits] [GIT] Evergreen ILS branch rel_3_0 updated. 5c07f11bcb78426734f3fdaf6c42c0fc6059b970

[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, rel_3_0 has been updated
       via  5c07f11bcb78426734f3fdaf6c42c0fc6059b970 (commit)
      from  37834a472c6137f87d296a41a82a3885a85c0c22 (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 5c07f11bcb78426734f3fdaf6c42c0fc6059b970
Author: Jason Boyer <jboyer at library.in.gov>
Date:   Tue Feb 27 08:58:12 2018 -0500

    LP1751520: Add contextMenu Module to JS
    
    Include the missing context-menu.js file to allow the
    angularTreeControl module to function properly.
    
    This branch is specific to rel_3_0 using Grunt.
    
    Signed-off-by: Jason Boyer <jboyer at library.in.gov>
    Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>

diff --git a/Open-ILS/src/templates/staff/base_js.tt2 b/Open-ILS/src/templates/staff/base_js.tt2
index 2932e45..bc0a175 100644
--- a/Open-ILS/src/templates/staff/base_js.tt2
+++ b/Open-ILS/src/templates/staff/base_js.tt2
@@ -44,6 +44,7 @@ UpUp.start({
     '[% ctx.media_prefix %]/js/ui/default/staff/build/js/angular-sanitize.min.js',
     '[% ctx.media_prefix %]/js/ui/default/staff/build/js/angular-cookies.min.js',
     '[% ctx.media_prefix %]/js/ui/default/staff/build/js/ngToast.min.js',
+    '[% ctx.media_prefix %]/js/ui/default/staff/build/js/context-menu.js',
     '[% ctx.media_prefix %]/js/ui/default/staff/build/js/angular-tree-control.js',
     '[% ctx.media_prefix %]/js/ui/default/staff/build/js/iframeResizer.min.js',
     '[% ctx.media_prefix %]/js/ui/default/staff/build/js/ng-order-object-by.js',
@@ -107,6 +108,7 @@ UpUp.start({
 <script src="[% ctx.media_prefix %]/js/ui/default/staff/build/js/angular-sanitize.min.js"></script>
 <script src="[% ctx.media_prefix %]/js/ui/default/staff/build/js/angular-cookies.min.js"></script>
 <script src="[% ctx.media_prefix %]/js/ui/default/staff/build/js/ngToast.min.js"></script>
+<script src="[% ctx.media_prefix %]/js/ui/default/staff/build/js/context-menu.js"></script>
 <script src="[% ctx.media_prefix %]/js/ui/default/staff/build/js/angular-tree-control.js"></script>
 <script src="[% ctx.media_prefix %]/js/ui/default/staff/build/js/iframeResizer.min.js"></script>
 <script src="[% ctx.media_prefix %]/js/ui/default/staff/build/js/ng-order-object-by.js"></script>
diff --git a/Open-ILS/web/js/ui/default/staff/Gruntfile.js b/Open-ILS/web/js/ui/default/staff/Gruntfile.js
index 13ae1da..c64eb44 100644
--- a/Open-ILS/web/js/ui/default/staff/Gruntfile.js
+++ b/Open-ILS/web/js/ui/default/staff/Gruntfile.js
@@ -28,6 +28,7 @@ module.exports = function(grunt) {
             'node_modules/angular-hotkeys/build/hotkeys.min.js',
             'node_modules/angular-file-saver/dist/angular-file-saver.bundle.min.js',
             'node_modules/angular-location-update/angular-location-update.min.js',
+            'node_modules/angular-tree-control/context-menu.js',
             'node_modules/angular-tree-control/angular-tree-control.js',
             'node_modules/ng-toast/dist/ngToast.min.js',
             'node_modules/angular-cookies/angular-cookies.min.js',
@@ -155,6 +156,7 @@ module.exports = function(grunt) {
             'build/js/ui-bootstrap.min.js',
             'build/js/ui-bootstrap-tpls.js',
             'build/js/hotkeys.min.js',
+            'build/js/context-menu.js',
             'build/js/angular-tree-control.js',
             'build/js/ngToast.min.js',
             'build/js/lovefield.min.js',

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

Summary of changes:
 Open-ILS/src/templates/staff/base_js.tt2      |    2 ++
 Open-ILS/web/js/ui/default/staff/Gruntfile.js |    2 ++
 2 files changed, 4 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
Evergreen ILS