From 8bcb2eadf4652f5cc4c19a10ff638ffde1e990e2 Mon Sep 17 00:00:00 2001 From: Jane Sandberg Date: Mon, 7 Sep 2020 12:55:50 -0700 Subject: [PATCH] LP1849212: Don't require role for course user Signed-off-by: Jane Sandberg --- .../admin/local/course-reserves/course-associate-users.component.ts | 5 ++++- Open-ILS/src/sql/Pg/040.schema.asset.sql | 2 +- Open-ILS/src/sql/Pg/upgrade/XXXX.schema.course-materials-module.sql | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Open-ILS/src/eg2/src/app/staff/admin/local/course-reserves/course-associate-users.component.ts b/Open-ILS/src/eg2/src/app/staff/admin/local/course-reserves/course-associate-users.component.ts index daa0fd740a..55d77b43df 100644 --- a/Open-ILS/src/eg2/src/app/staff/admin/local/course-reserves/course-associate-users.component.ts +++ b/Open-ILS/src/eg2/src/app/staff/admin/local/course-reserves/course-associate-users.component.ts @@ -69,9 +69,12 @@ export class CourseAssociateUsersComponent extends DialogComponent implements On const args = { currentCourse: this.currentCourse, barcode: barcode.trim(), - role: this.userRoleInput.id }; + if (this.userRoleInput) { + args['role'] = this.userRoleInput.id; + } + this.userBarcode = null; this.net.request( diff --git a/Open-ILS/src/sql/Pg/040.schema.asset.sql b/Open-ILS/src/sql/Pg/040.schema.asset.sql index 609b09b9a0..1b98322254 100644 --- a/Open-ILS/src/sql/Pg/040.schema.asset.sql +++ b/Open-ILS/src/sql/Pg/040.schema.asset.sql @@ -1124,7 +1124,7 @@ CREATE TABLE asset.course_module_course_users ( id SERIAL PRIMARY KEY, course INT NOT NULL REFERENCES asset.course_module_course (id), usr INT NOT NULL REFERENCES actor.usr (id), - usr_role INT NOT NULL REFERENCES asset.course_module_role (id) ON UPDATE CASCADE ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED + usr_role INT REFERENCES asset.course_module_role (id) ON UPDATE CASCADE ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED ); CREATE TABLE asset.course_module_course_materials ( diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.course-materials-module.sql b/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.course-materials-module.sql index 1358fccbfb..479d132acc 100644 --- a/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.course-materials-module.sql +++ b/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.course-materials-module.sql @@ -21,7 +21,7 @@ CREATE TABLE asset.course_module_course_users ( id SERIAL PRIMARY KEY, course INT NOT NULL REFERENCES asset.course_module_course (id), usr INT NOT NULL REFERENCES actor.usr (id), - usr_role INT NOT NULL REFERENCES asset.course_module_role (id) ON UPDATE CASCADE ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED + usr_role INT REFERENCES asset.course_module_role (id) ON UPDATE CASCADE ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED ); CREATE TABLE asset.course_module_course_materials ( -- 2.11.0