From fabdc5aba3f13489bcd8192dfd7195de516702dc Mon Sep 17 00:00:00 2001 From: Bill Erickson Date: Wed, 29 Jul 2015 09:33:26 -0400 Subject: [PATCH] webstaff: browser: closed dates / research missing dump() func Signed-off-by: Bill Erickson Signed-off-by: Galen Charlton Signed-off-by: Kathy Lussier --- .../templates/staff/admin/local/t_splash.tt2 | 8 +++++ .../js/ui/default/staff/admin/local/app.js | 29 ++++++++++++++----- 2 files changed, 29 insertions(+), 8 deletions(-) diff --git a/Open-ILS/src/templates/staff/admin/local/t_splash.tt2 b/Open-ILS/src/templates/staff/admin/local/t_splash.tt2 index 9505bc3ef7..701286bf23 100644 --- a/Open-ILS/src/templates/staff/admin/local/t_splash.tt2 +++ b/Open-ILS/src/templates/staff/admin/local/t_splash.tt2 @@ -55,6 +55,14 @@ +
+ +
diff --git a/Open-ILS/web/js/ui/default/staff/admin/local/app.js b/Open-ILS/web/js/ui/default/staff/admin/local/app.js index e2ecfa860b..b3716f7535 100644 --- a/Open-ILS/web/js/ui/default/staff/admin/local/app.js +++ b/Open-ILS/web/js/ui/default/staff/admin/local/app.js @@ -14,7 +14,14 @@ angular.module('egLocalAdmin', // non-conify routes come first $routeProvider.when('/admin/local/money/cash_reports', { template: eframe_template, - controller: 'CashReportsCtl', // non-conify + controller: 'EmbedXHTMLCtl', // non-conify + resolve : resolver + }); + + // non-conify routes come first + $routeProvider.when('/admin/local/actor/closed_dates', { + template: eframe_template, + controller: 'EmbedXHTMLCtl', // non-conify resolve : resolver }); @@ -52,15 +59,21 @@ function($scope , $routeParams , $location , egCore) { }]) -.controller('CashReportsCtl', - ['$scope','$location','egCore', -function($scope , $location , egCore) { - $scope.local_admin_url = $location.absUrl().replace( - /\/.*/, '/xul/server/admin/cash_reports.xhtml'); +.controller('EmbedXHTMLCtl', + ['$scope','$location','egCore','$timeout', +function($scope , $location , egCore , $timeout) { - // old-school XUL admin UI's only want CGI ses values. - $scope.local_admin_url += '?ses=' + egCore.auth.token(); + $scope.funcs = {}; + + var xul_base = '/xul/server/admin/'; + var page_parts = $location.path().split(/\//); + var url = xul_base + page_parts[page_parts.length - 1] + '.xhtml'; + // old-school XUL admin UI's only want CGI ses values. + url += '?ses=' + egCore.auth.token(); + console.log('Loading local admin URL: ' + $scope.local_admin_url); + + $scope.local_admin_url = $location.absUrl().replace(/\/.*/, url); }]) -- 2.43.2