From 445e88000a70805e6d286d71118e84d2c8843733 Mon Sep 17 00:00:00 2001
From: erickson <erickson@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Date: Fri, 25 Apr 2008 20:33:10 +0000
Subject: [PATCH] forward-porting merge_bib_records perm and adding it to the
 seed data

git-svn-id: svn://svn.open-ils.org/ILS/trunk@9452 dcc99617-32d9-48b4-a31d-7c20da2025e4
---
 Open-ILS/src/perlmods/OpenILS/Application/Cat/Merge.pm | 9 ++++++---
 Open-ILS/src/sql/Pg/950.data.seed-values.sql           | 1 +
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/Open-ILS/src/perlmods/OpenILS/Application/Cat/Merge.pm b/Open-ILS/src/perlmods/OpenILS/Application/Cat/Merge.pm
index 0c54a50598..991238089a 100644
--- a/Open-ILS/src/perlmods/OpenILS/Application/Cat/Merge.pm
+++ b/Open-ILS/src/perlmods/OpenILS/Application/Cat/Merge.pm
@@ -38,6 +38,10 @@ sub rgrep {
 sub merge_records {
 	my( $editor, $master, $records ) = @_;
 
+    # bib records are global objects, so no org context required.
+    return (undef, $editor->die_event) 
+        unless $editor->allowed('MERGE_BIB_RECORDS');
+
 	my $vol;
 	my $evt;
 
@@ -133,7 +137,7 @@ sub merge_records {
 				$record->deleted('f');
 				$record->editor($reqr->id);
 				$record->edit_date('now');
-				$editor->update_biblio_record_entry($record, {checkperm => 1})
+				$editor->update_biblio_record_entry($record)
 					or return $editor->die_event;
 			}
 
@@ -142,7 +146,7 @@ sub merge_records {
 			$record->deleted('t');
 			$record->editor($reqr->id);
 			$record->edit_date('now');
-			$editor->update_biblio_record_entry($record, {checkperm => 1})
+			$editor->update_biblio_record_entry($record)
 				or return $editor->die_event;
 		}
 	}
@@ -216,7 +220,6 @@ sub merge_volumes {
 		$_->deleted('t');
 		$_->editor($editor->requestor->id);
 		$_->edit_date('now');
-		return (undef,$editor->die_event) unless $editor->allowed('UPDATE_VOLUME', $_->owning_lib);
 		$editor->update_asset_call_number($_) or return (undef, $editor->die_event);
         merge_volume_holds($editor, $bigcn, $_->id);
 	}
diff --git a/Open-ILS/src/sql/Pg/950.data.seed-values.sql b/Open-ILS/src/sql/Pg/950.data.seed-values.sql
index 02933e9dab..22d3fb7318 100644
--- a/Open-ILS/src/sql/Pg/950.data.seed-values.sql
+++ b/Open-ILS/src/sql/Pg/950.data.seed-values.sql
@@ -1102,6 +1102,7 @@ INSERT INTO permission.perm_list (code) VALUES ('UPDATE_TRANSIT');
 INSERT INTO permission.perm_list (code) VALUES ('UPDATE_VOLUME_NOTE');
 INSERT INTO permission.perm_list (code) VALUES ('UPDATE_VR_FORMAT');
 INSERT INTO permission.perm_list (code) VALUES ('UPDATE_XML_TRANSFORM');
+INSERT INTO permission.perm_list (code) VALUES ('MERGE_BIB_RECORDS');
 
 
 INSERT INTO permission.grp_tree (id, name, parent, description, perm_interval, usergroup, application_perm) VALUES
-- 
2.11.0