Skip to content

Commit 6ca6119

Browse files
committed
SAK-52145 display duplicated group quizzes w/o changing 'released to' setting
1 parent 0ccc342 commit 6ca6119

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

samigo/samigo-app/src/java/org/sakaiproject/tool/assessment/bundle/AuthorFrontDoorMessages.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ entire_site=Entire Site
4343

4444
selected_groups=Selected Groups
4545
selected_group=Selected Group
46-
no_selected_groups_error=Students are not able to take this assessment because the groups it was released to have been deleted. You must publish a new copy of this assessment.
46+
no_selected_groups_error=This assessment was released to a group, but no group is selected. Please select a group to publish this assessment.
4747

4848
header_last_modified=Last Modified
4949
header_last_modified_date=Modified Date

samigo/samigo-services/src/java/org/sakaiproject/tool/assessment/facade/AssessmentFacadeQueries.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@
4343

4444
import org.apache.commons.lang3.StringUtils;
4545
import org.apache.commons.collections4.CollectionUtils;
46+
import org.apache.commons.collections4.MapUtils;
4647
import org.hibernate.Hibernate;
4748
import org.hibernate.Session;
4849
import org.hibernate.query.Query;
@@ -752,7 +753,7 @@ public List<AssessmentFacade> getBasicInfoOfAllActiveAssessmentsByAgent(String o
752753
questionSize = ((Long) questionSizeMap.get(a.getAssessmentBaseId())).intValue();
753754
}
754755

755-
if (releaseToGroups != null) {
756+
if (!MapUtils.isEmpty(releaseToGroups)) {
756757
Set<String> keysReleaseToGroups = releaseToGroups.keySet();
757758

758759
Set<String> commonKeys = new HashSet<>(keysReleaseToGroups);
@@ -1936,7 +1937,8 @@ public AssessmentData prepareAssessment(AssessmentData a, String protocol, Strin
19361937
switch (releaseTo) {
19371938
case AssessmentAccessControl.ANONYMOUS_USERS:
19381939
break;
1939-
// case AssessmentAccessControl.RELEASE_TO_SELECTED_GROUPS:
1940+
case AssessmentAccessControl.RELEASE_TO_SELECTED_GROUPS:
1941+
break;
19401942
default:
19411943
// if not anonymous or group then set releaseTo to the site title
19421944
if (toContext != null) {

0 commit comments

Comments
 (0)