Index: lams_tool_doku/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -re1b28fc8de1d5122d10b7209e2bb1386827117f0 -r4a6be45d5c1bbf95b3441d7e152dcb94b52284c1
--- lams_tool_doku/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision e1b28fc8de1d5122d10b7209e2bb1386827117f0)
+++ lams_tool_doku/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 4a6be45d5c1bbf95b3441d7e152dcb94b52284c1)
@@ -103,8 +103,8 @@
 monitoring.summary.gallery.walk.start.confirm = Are you sure you want to finish collaboration phase and start Gallery Walk?
 monitoring.summary.gallery.walk.finish = Finish Gallery Walk
 monitoring.summary.gallery.walk.finish.confirm = Are you sure you want to finish Gallery Walk?
-monitoring.summary.learner.reedit = Let learners modify answers
-monitoring.summary.learner.reedit.confirm = Are you sure you want allows students to modify their answers again?
+monitoring.summary.gallery.walk.learner.edit = Let learners modify answers
+monitoring.summary.gallery.walk.learner.edit.confirm = Are you sure you want allows students to modify their answers while inside Gallery Walk?
 label.gallery.walk = Gallery Walk
 label.gallery.walk.wait.finish = The Gallery Walk activity has not been set as completed by the teacher. If you have completed, please contact the teacher for assistance.
 label.rating = Rating
Index: lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/dbupdates/patch20210728.sql
===================================================================
diff -u
--- lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/dbupdates/patch20210728.sql	(revision 0)
+++ lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/dbupdates/patch20210728.sql	(revision 4a6be45d5c1bbf95b3441d7e152dcb94b52284c1)
@@ -0,0 +1,16 @@
+-- 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-5222 Allow reedit in doKu tool
+
+
+ALTER TABLE tl_ladoku11_dokumaran ADD COLUMN gallery_walk_edit_enabled TINYINT NOT NULL DEFAULT 0 AFTER gallery_walk_finished;
+
+-- 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_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/model/Dokumaran.java
===================================================================
diff -u -r4964ab69222479e65618ae30e4dde3536163735a -r4a6be45d5c1bbf95b3441d7e152dcb94b52284c1
--- lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/model/Dokumaran.java	(.../Dokumaran.java)	(revision 4964ab69222479e65618ae30e4dde3536163735a)
+++ lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/model/Dokumaran.java	(.../Dokumaran.java)	(revision 4a6be45d5c1bbf95b3441d7e152dcb94b52284c1)
@@ -131,6 +131,9 @@
     @Column(name = "gallery_walk_finished")
     private boolean galleryWalkFinished;
 
+    @Column(name = "gallery_walk_edit_enabled")
+    private boolean galleryWalkEditEnabled;
+
     @Column(name = "gallery_walk_instructions")
     private String galleryWalkInstructions;
 
@@ -478,6 +481,14 @@
 	this.galleryWalkFinished = galleryWalkFinished;
     }
 
+    public boolean isGalleryWalkEditEnabled() {
+	return galleryWalkEditEnabled;
+    }
+
+    public void setGalleryWalkEditEnabled(boolean galleryWalkEditEnabled) {
+	this.galleryWalkEditEnabled = galleryWalkEditEnabled;
+    }
+
     public String getGalleryWalkInstructions() {
 	return galleryWalkInstructions;
     }
Index: lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/service/DokumaranService.java
===================================================================
diff -u -r9395dbdd7388571aced1bb99d1d5e3d19c89e2df -r4a6be45d5c1bbf95b3441d7e152dcb94b52284c1
--- lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/service/DokumaranService.java	(.../DokumaranService.java)	(revision 9395dbdd7388571aced1bb99d1d5e3d19c89e2df)
+++ lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/service/DokumaranService.java	(.../DokumaranService.java)	(revision 4a6be45d5c1bbf95b3441d7e152dcb94b52284c1)
@@ -631,15 +631,14 @@
     }
 
     @Override
-    public void learnerReedit(long toolContentId) throws IOException {
+    public void enableGalleryWalkLearnerEdit(long toolContentId) throws IOException {
 	Dokumaran dokumaran = getDokumaranByContentId(toolContentId);
 	if (!dokumaran.isGalleryWalkEnabled()) {
 	    throw new IllegalArgumentException(
 		    "Can not allow learners to reedit activity as Gallery Walk is not enabled for Dokumaran with tool content ID "
 			    + toolContentId);
 	}
-	dokumaran.setGalleryWalkStarted(false);
-	dokumaran.setGalleryWalkFinished(false);
+	dokumaran.setGalleryWalkEditEnabled(true);
 	dokumaranDao.saveObject(dokumaran);
 
 	sendGalleryWalkRefreshRequest(dokumaran);
Index: lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/service/IDokumaranService.java
===================================================================
diff -u -r87dce5c82fdf33a8e8335ed56f6a75b5c06a11cb -r4a6be45d5c1bbf95b3441d7e152dcb94b52284c1
--- lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/service/IDokumaranService.java	(.../IDokumaranService.java)	(revision 87dce5c82fdf33a8e8335ed56f6a75b5c06a11cb)
+++ lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/service/IDokumaranService.java	(.../IDokumaranService.java)	(revision 4a6be45d5c1bbf95b3441d7e152dcb94b52284c1)
@@ -233,7 +233,7 @@
 
     void finishGalleryWalk(long toolContentId) throws IOException;
 
-    void learnerReedit(long toolContentId) throws IOException;
+    void enableGalleryWalkLearnerEdit(long toolContentId) throws IOException;
 
     void changeLeaderForGroup(long toolSessionId, long leaderUserId);
 
Index: lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/web/controller/MonitoringController.java
===================================================================
diff -u -r87dce5c82fdf33a8e8335ed56f6a75b5c06a11cb -r4a6be45d5c1bbf95b3441d7e152dcb94b52284c1
--- lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/web/controller/MonitoringController.java	(.../MonitoringController.java)	(revision 87dce5c82fdf33a8e8335ed56f6a75b5c06a11cb)
+++ lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/web/controller/MonitoringController.java	(.../MonitoringController.java)	(revision 4a6be45d5c1bbf95b3441d7e152dcb94b52284c1)
@@ -314,11 +314,11 @@
 	dokumaranService.finishGalleryWalk(toolContentId);
     }
 
-    @RequestMapping("/learnerReedit")
-    private void learnerReedit(HttpServletRequest request) throws IOException {
+    @RequestMapping("/enableGalleryWalkLearnerEdit")
+    private void enableGalleryWalkLearnerEdit(HttpServletRequest request) throws IOException {
 	Long toolContentId = WebUtil.readLongParam(request, DokumaranConstants.ATTR_TOOL_CONTENT_ID, false);
 
-	dokumaranService.learnerReedit(toolContentId);
+	dokumaranService.enableGalleryWalkLearnerEdit(toolContentId);
     }
 
     @RequestMapping("/ae")
Index: lams_tool_doku/web/pages/learning/galleryWalk.jsp
===================================================================
diff -u -rd5fa41792bdb2657d0d53c35126a64604510d18a -r4a6be45d5c1bbf95b3441d7e152dcb94b52284c1
--- lams_tool_doku/web/pages/learning/galleryWalk.jsp	(.../galleryWalk.jsp)	(revision d5fa41792bdb2657d0d53c35126a64604510d18a)
+++ lams_tool_doku/web/pages/learning/galleryWalk.jsp	(.../galleryWalk.jsp)	(revision 4a6be45d5c1bbf95b3441d7e152dcb94b52284c1)
@@ -162,8 +162,9 @@
 								     isItemAuthoredByUser="${dokumaran.galleryWalkFinished or not hasEditRight or mode == 'teacher'}" />
 		       	    </c:if>
 		 
-					<lams:Etherpad groupId="${groupSummary.sessionId}" padId="${groupSummary.readOnlyPadId}"
-								   showControls="${not dokumaran.galleryWalkFinished and not dokumaran.galleryWalkReadOnly and hasEditRight}"
+					<lams:Etherpad groupId="${groupSummary.sessionId}"
+								   padId="${hasEditRight and dokumaran.galleryWalkEditEnabled and toolSessionID == groupSummary.sessionId ? groupSummary.padId : groupSummary.readOnlyPadId}"
+								   showControls="${hasEditRight and ((dokumaran.galleryWalkEditEnabled and toolSessionID == groupSummary.sessionId) or (not dokumaran.galleryWalkFinished and not dokumaran.galleryWalkReadOnly))}"
 								   showOnDemand="true" height="600" />	
 				</div>
 			</div>
Index: lams_tool_doku/web/pages/monitoring/summary.jsp
===================================================================
diff -u -r9395dbdd7388571aced1bb99d1d5e3d19c89e2df -r4a6be45d5c1bbf95b3441d7e152dcb94b52284c1
--- lams_tool_doku/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision 9395dbdd7388571aced1bb99d1d5e3d19c89e2df)
+++ lams_tool_doku/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision 4a6be45d5c1bbf95b3441d7e152dcb94b52284c1)
@@ -315,7 +315,7 @@
 				let summaryPane = $('#doku-monitoring-summary-${sessionMap.toolContentID}');
 				
 				$('#gallery-walk-start', summaryPane).hide();
-				$('#gallery-walk-finish, #learner-reedit', summaryPane).removeClass('hidden');
+				$('#gallery-walk-finish, #gallery-walk-learner-edit', summaryPane).removeClass('hidden');
 			}
 		});
 	}
@@ -348,13 +348,13 @@
 	}
 
 	
-	function learnerReedit(){
-		if (!confirm('<fmt:message key="monitoring.summary.learner.reedit.confirm" />')) {
+	function enableGalleryWalkLearnerEdit(){
+		if (!confirm('<fmt:message key="monitoring.summary.gallery.walk.learner.edit.confirm" />')) {
 			return;
 		}
 		
 		$.ajax({
-			'url' : '<c:url value="/monitoring/learnerReedit.do"/>',
+			'url' : '<c:url value="/monitoring/enableGalleryWalkLearnerEdit.do"/>',
 			'data': {
 				toolContentID : ${dokumaran.contentId}
 			},
@@ -783,10 +783,10 @@
 					<fmt:message key="monitoring.summary.gallery.walk.start" /> 
 				</button>
 								
-				<button id="learner-reedit" type="button"
-				        class="btn btn-default ${dokumaran.galleryWalkStarted or dokumaran.galleryWalkFinished ? '' : 'hidden'}"
-				        onClick="javascript:learnerReedit()">
-					<fmt:message key="monitoring.summary.learner.reedit" /> 
+				<button id="gallery-walk-learner-edit" type="button"
+				        class="btn btn-default ${not dokumaran.galleryWalkEditEnabled and (dokumaran.galleryWalkStarted or dokumaran.galleryWalkFinished) ? '' : 'hidden'}"
+				        onClick="javascript:enableGalleryWalkLearnerEdit()">
+					<fmt:message key="monitoring.summary.gallery.walk.learner.edit" /> 
 				</button>
 				
 				<button id="gallery-walk-finish" type="button"