From 0c31ebb7579383a3bafd1562121935c3753d53fc Mon Sep 17 00:00:00 2001 From: Bill Erickson Date: Mon, 14 Jul 2014 12:41:48 -0400 Subject: [PATCH] move pending patrons to /circ/patron/pending; wire up load action Signed-off-by: Bill Erickson --- .../{pending_patrons/index.tt2 => patron/pending.tt2} | 2 +- .../t_list.tt2 => patron/t_pending_list.tt2} | 0 Open-ILS/src/templates/staff/navbar.tt2 | 4 ++-- .../circ/{pending_patrons/app.js => patron/pending.js} | 18 ++++++++++++++---- 4 files changed, 17 insertions(+), 7 deletions(-) rename Open-ILS/src/templates/staff/circ/{pending_patrons/index.tt2 => patron/pending.tt2} (84%) rename Open-ILS/src/templates/staff/circ/{pending_patrons/t_list.tt2 => patron/t_pending_list.tt2} (100%) rename Open-ILS/web/js/ui/default/staff/circ/{pending_patrons/app.js => patron/pending.js} (81%) diff --git a/Open-ILS/src/templates/staff/circ/pending_patrons/index.tt2 b/Open-ILS/src/templates/staff/circ/patron/pending.tt2 similarity index 84% rename from Open-ILS/src/templates/staff/circ/pending_patrons/index.tt2 rename to Open-ILS/src/templates/staff/circ/patron/pending.tt2 index 99539e5a78..21c21cb32a 100644 --- a/Open-ILS/src/templates/staff/circ/pending_patrons/index.tt2 +++ b/Open-ILS/src/templates/staff/circ/patron/pending.tt2 @@ -8,7 +8,7 @@ - + [% END %] diff --git a/Open-ILS/src/templates/staff/circ/pending_patrons/t_list.tt2 b/Open-ILS/src/templates/staff/circ/patron/t_pending_list.tt2 similarity index 100% rename from Open-ILS/src/templates/staff/circ/pending_patrons/t_list.tt2 rename to Open-ILS/src/templates/staff/circ/patron/t_pending_list.tt2 diff --git a/Open-ILS/src/templates/staff/navbar.tt2 b/Open-ILS/src/templates/staff/navbar.tt2 index 7bf674c133..c4ff8691c0 100644 --- a/Open-ILS/src/templates/staff/navbar.tt2 +++ b/Open-ILS/src/templates/staff/navbar.tt2 @@ -93,7 +93,7 @@
  • - + [% l('Register Patron') %]
  • @@ -104,7 +104,7 @@
  • - + [% l('Pending Patrons') %] diff --git a/Open-ILS/web/js/ui/default/staff/circ/pending_patrons/app.js b/Open-ILS/web/js/ui/default/staff/circ/patron/pending.js similarity index 81% rename from Open-ILS/web/js/ui/default/staff/circ/pending_patrons/app.js rename to Open-ILS/web/js/ui/default/staff/circ/patron/pending.js index 7a1b4e33aa..9c2bc652c8 100644 --- a/Open-ILS/web/js/ui/default/staff/circ/pending_patrons/app.js +++ b/Open-ILS/web/js/ui/default/staff/circ/patron/pending.js @@ -8,19 +8,21 @@ angular.module('egPendingPatronsApp', var resolver = {delay : ['egStartup', function(egStartup) {return egStartup.go()}]} - $routeProvider.when('/circ/pending_patrons/list', { - templateUrl: './circ/pending_patrons/t_list', + $routeProvider.when('/circ/patron/pending/list', { + templateUrl: './circ/patron/t_pending_list', controller: 'PendingPatronsCtrl', resolve : resolver }); - $routeProvider.otherwise({redirectTo : '/circ/pending_patrons/list'}); + $routeProvider.otherwise({redirectTo : '/circ/patron/pending/list'}); }) .controller('PendingPatronsCtrl', ['$scope','$q','$routeParams','$window','$location','egCore','egGridDataProvider', function($scope , $q , $routeParams , $window , $location , egCore , egGridDataProvider) { + console.log('HERE'); + var pending_patrons = []; var provider = egGridDataProvider.instance({}); $scope.grid_data_provider = provider; @@ -28,7 +30,15 @@ function($scope , $q , $routeParams , $window , $location , egCore , egGridDataP function load_patron(item) { if (angular.isArray(item)) item = item[0]; if (!item) return; - // TODO: where does patron editor w/ no context patron live? + $window.open( + $location.path( + '/circ/patron/register/stage/' + item.user.usrname()).absUrl(), + '_blank' + ).focus(); + } + + $scope.load_patron = function(action, data, items) { + load_patron(items); } $scope.grid_controls = { -- 2.11.0