LP1926310 Record bucket batch edit destination

Record Bucket => Batch Edit now opens the new Angular MARC Batch Edit
interface.

Signed-off-by: Bill Erickson <berickxx@gmail.com>
Signed-off-by: Garry Collum <gcollum@gmail.com>
Signed-off-by: Galen Charlton <gmc@equinoxOLI.org>

diff --git a/Open-ILS/src/eg2/src/app/staff/cat/marcbatch/marcbatch.component.html b/Open-ILS/src/eg2/src/app/staff/cat/marcbatch/marcbatch.component.html
index bfa2952..a9e2b89 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/cat/marcbatch/marcbatch.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/cat/marcbatch/marcbatch.component.html
@@ -125,7 +125,8 @@
       <ng-container *ngIf="source == 'b'">
         <div class="col-lg-3" i18n>Bucket named: </div>
         <div class="col-lg-6">
-          <eg-combobox [entries]="buckets" (onChange)="bucketChanged($event)">
+          <eg-combobox [selectedId]="bucket" 
+            [entries]="buckets" (onChange)="bucketChanged($event)">
           </eg-combobox>
         </div>
       </ng-container>

diff --git a/Open-ILS/src/eg2/src/app/staff/cat/marcbatch/marcbatch.component.ts b/Open-ILS/src/eg2/src/app/staff/cat/marcbatch/marcbatch.component.ts
index 81e3913..67ab4b3 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/cat/marcbatch/marcbatch.component.ts
+++ b/Open-ILS/src/eg2/src/app/staff/cat/marcbatch/marcbatch.component.ts
@@ -56,6 +56,18 @@ export class MarcBatchComponent implements OnInit {
     ) {}
 
     ngOnInit() {
+
+        this.route.paramMap.subscribe((params: ParamMap) => {
+            this.bucket = +params.get('bucketId');
+            this.recordId = +params.get('recordId');
+
+            if (this.bucket) {
+                this.source = 'b';
+            } else if (this.recordId) {
+                this.source = 'r';
+            }
+        });
+
         this.load();
     }
 

diff --git a/Open-ILS/src/eg2/src/app/staff/cat/marcbatch/routing.module.ts b/Open-ILS/src/eg2/src/app/staff/cat/marcbatch/routing.module.ts
index bb268e6..9eb287b 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/cat/marcbatch/routing.module.ts
+++ b/Open-ILS/src/eg2/src/app/staff/cat/marcbatch/routing.module.ts
@@ -5,6 +5,12 @@ import {MarcBatchComponent} from './marcbatch.component';
 const routes: Routes = [{
     path: '',
     component: MarcBatchComponent
+  }, {
+    path: 'bucket/:bucketId',
+    component: MarcBatchComponent
+  }, {
+    path: 'record/:recordId',
+    component: MarcBatchComponent
 }];
 
 @NgModule({

diff --git a/Open-ILS/web/js/ui/default/staff/cat/bucket/record/app.js b/Open-ILS/web/js/ui/default/staff/cat/bucket/record/app.js
index 0474429..0a126b5 100644 (file)
--- a/Open-ILS/web/js/ui/default/staff/cat/bucket/record/app.js
+++ b/Open-ILS/web/js/ui/default/staff/cat/bucket/record/app.js
@@ -763,8 +763,7 @@ function($scope,  $q , $routeParams,  bucketSvc,  egCore,  $window,
     }
 
     $scope.batchEdit = function() {
-        var url = egCore.env.basePath +
-                  'cat/catalog/batchEdit/bucket/' + $scope.bucketId;
+        var url = '/eg2/staff/cat/marcbatch/bucket/' + $scope.bucketId;
         $timeout(function() { $window.open(url, '_blank') });
     }