Comment 73 for bug 1888723

Revision history for this message
Ted Peterson (devted) wrote :

git merge working/user/berick/lp1888723-angular-volcopy-v11

There were several merge conflicts with master so I didn't add this to our bug squash instance:

CONFLICT (content): Merge conflict in Open-ILS/src/eg2/src/app/staff/share/holdings/holdings.service.ts
- can fix by adding the new getMagicCopyStatuses() function.

CONFLICT (content): Merge conflict in Open-ILS/src/eg2/src/app/staff/catalog/record/copies.component.ts
-can *probably* fix by removing the this.openHoldingsEditor() function?
OR DID ANOTHER RECENT PATCH ADD THAT SO WE SHOULDN'T REMOVE IT?

CONFLICT (content): Merge conflict in Open-ILS/src/eg2/src/app/staff/cat/routing.module.ts
- can fix by adding the new volcopy() function.
Insert "}, {" after removing "=======" of course.