Index: lams_common/src/java/org/lamsfoundation/lams/commonContext.xml =================================================================== diff -u -r045ebfd1d11d9ed0a1f81a00abb1a2ea373e8d93 -ra20a3b3c23f8f59e7fa25a5c958466f8c8ba73ec --- lams_common/src/java/org/lamsfoundation/lams/commonContext.xml (.../commonContext.xml) (revision 045ebfd1d11d9ed0a1f81a00abb1a2ea373e8d93) +++ lams_common/src/java/org/lamsfoundation/lams/commonContext.xml (.../commonContext.xml) (revision a20a3b3c23f8f59e7fa25a5c958466f8c8ba73ec) @@ -316,6 +316,7 @@ PROPAGATION_REQUIRED PROPAGATION_REQUIRED PROPAGATION_REQUIRED + PROPAGATION_REQUIRED PROPAGATION_REQUIRED PROPAGATION_REQUIRED Index: lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20180625.sql =================================================================== diff -u --- lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20180625.sql (revision 0) +++ lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20180625.sql (revision a20a3b3c23f8f59e7fa25a5c958466f8c8ba73ec) @@ -0,0 +1,15 @@ +-- Turn off autocommit, so nothing is committed if there is an error +SET AUTOCOMMIT = 0; +SET FOREIGN_KEY_CHECKS=0; +----------------------Put all sql statements below here------------------------- + +-- LDEV-4603 Delete preview lessons with peer review activity doesn't work +ALTER TABLE lams_rating DROP FOREIGN KEY FK_lams_rating_3; +ALTER TABLE lams_rating_comment DROP FOREIGN KEY FK_lams_rating_comment_3; + +----------------------Put all sql statements above here------------------------- + +-- If there were no errors, commit and restore autocommit to on +COMMIT; +SET AUTOCOMMIT = 1; +SET FOREIGN_KEY_CHECKS=1; \ No newline at end of file Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/dbupdates/patch20180625.sql =================================================================== diff -u --- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/dbupdates/patch20180625.sql (revision 0) +++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/dbupdates/patch20180625.sql (revision a20a3b3c23f8f59e7fa25a5c958466f8c8ba73ec) @@ -0,0 +1,20 @@ +-- Turn off autocommit, so nothing is committed if there is an error +SET AUTOCOMMIT = 0; +SET FOREIGN_KEY_CHECKS=0; +----------------------Put all sql statements below here------------------------- + +-- LDEV-4603 Delete preview lessons with peer review activity doesn't work +ALTER TABLE tl_lafrum11_message_rating DROP FOREIGN KEY FK_tl_lafrum11_message_rating_2; +ALTER TABLE tl_lafrum11_message_rating ADD CONSTRAINT FK_tl_lafrum11_message_rating_2 + FOREIGN KEY (message_id) + REFERENCES tl_lafrum11_message (uid) + ON DELETE CASCADE + ON UPDATE CASCADE; + +----------------------Put all sql statements above here------------------------- + +-- If there were no errors, commit and restore autocommit to on +COMMIT; +SET AUTOCOMMIT = 1; +SET FOREIGN_KEY_CHECKS=1; + Index: lams_tool_larsrc/web/pages/learning/learning.jsp =================================================================== diff -u -r4583983b64efe1d91fbb47cdde6a759a6a30e859 -ra20a3b3c23f8f59e7fa25a5c958466f8c8ba73ec --- lams_tool_larsrc/web/pages/learning/learning.jsp (.../learning.jsp) (revision 4583983b64efe1d91fbb47cdde6a759a6a30e859) +++ lams_tool_larsrc/web/pages/learning/learning.jsp (.../learning.jsp) (revision a20a3b3c23f8f59e7fa25a5c958466f8c8ba73ec) @@ -254,7 +254,7 @@ + disabled="${mode == 'teacher' || finishedLock}" allowRetries="true" />