zervo/seb-server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/dev-1.5' into development

Browse source 
Conflicts:
	pom.xml
This commit is contained in:
anhefti 2023-06-19 14:37:25 +02:00
commit 62f993ccd5
2 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
README.rst
View file

@ -98,8 +98,6 @@ Bugfixes:
Docker-Image: Docker-Image:
TODO
SEB - SEB Server Compatibility SEB - SEB Server Compatibility
------------------------------ ------------------------------

11
src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/lms/impl/moodle/plugin/MoodlePluginCourseAccess.java
View file

@ -82,6 +82,9 @@ public class MoodlePluginCourseAccess extends AbstractCachedCourseAccess impleme
public static final String PARAM_PAGE_START = "startneedle"; public static final String PARAM_PAGE_START = "startneedle";
public static final String PARAM_PAGE_SIZE = "perpage"; public static final String PARAM_PAGE_SIZE = "perpage";
public static final String SQL_QUIZ_NAME = "m.name";
public static final String SQL_COURSE_NAME = "shortname";
public static final String SQL_CONDITION_TEMPLATE = public static final String SQL_CONDITION_TEMPLATE =
//"(startdate >= %s or timecreated >=%s) and (enddate is null or enddate = 0 or enddate >= %s)"; //"(startdate >= %s or timecreated >=%s) and (enddate is null or enddate = 0 or enddate >= %s)";
"(startdate is null OR startdate = 0 OR startdate >= %s) AND (enddate is null or enddate = 0 OR enddate >= %s)"; "(startdate is null OR startdate = 0 OR startdate >= %s) AND (enddate is null or enddate = 0 OR enddate >= %s)";
@ -432,9 +435,13 @@ public class MoodlePluginCourseAccess extends AbstractCachedCourseAccess impleme
final LinkedMultiValueMap<String, String> attributes = new LinkedMultiValueMap<>(); final LinkedMultiValueMap<String, String> attributes = new LinkedMultiValueMap<>();
if (this.applyNameCriteria && StringUtils.isNotBlank(nameCondition)) { if (this.applyNameCriteria && StringUtils.isNotBlank(nameCondition)) {
sqlCondition = sqlCondition + " AND (name LIKE '" + sqlCondition = sqlCondition + " AND (" +
SQL_QUIZ_NAME +
" LIKE '" +
Utils.toSQLWildcard(nameCondition) + Utils.toSQLWildcard(nameCondition) +
"' OR shortname LIKE '" + "' OR " +
SQL_COURSE_NAME +
" LIKE '" +
Utils.toSQLWildcard(nameCondition) + Utils.toSQLWildcard(nameCondition) +
"')"; "')";
} }