Index: lams_common/src/java/org/lamsfoundation/lams/integration/service/IIntegrationService.java =================================================================== diff -u -rb89b4282be5db1310440d337d16c232e4e1a46d6 -r521b542aaaa17584d68940f23bfc880f1a2ce340 --- lams_common/src/java/org/lamsfoundation/lams/integration/service/IIntegrationService.java (.../IIntegrationService.java) (revision b89b4282be5db1310440d337d16c232e4e1a46d6) +++ lams_common/src/java/org/lamsfoundation/lams/integration/service/IIntegrationService.java (.../IIntegrationService.java) (revision 521b542aaaa17584d68940f23bfc880f1a2ce340) @@ -265,6 +265,11 @@ String firstName, String lastName, String email, String extCourseId, String countryIsoCode, String langIsoCode, boolean usePrefix) throws UserInfoFetchException, UserInfoValidationException; + ExtUserUseridMap addExtUserToCourseAndLesson(ExtServer extServer, String method, Long lesssonId, String username, + String firstName, String lastName, String email, String extCourseId, String prettyCourseName, + String countryIsoCode, String langIsoCode, boolean usePrefix) + throws UserInfoFetchException, UserInfoValidationException; + /** * Creates an external org and normal org. It does not set roles for the creator. */ Index: lams_common/src/java/org/lamsfoundation/lams/integration/service/IntegrationService.java =================================================================== diff -u -r5ea3989da5d464f07dbb65385929e7808dd15dca -r521b542aaaa17584d68940f23bfc880f1a2ce340 --- lams_common/src/java/org/lamsfoundation/lams/integration/service/IntegrationService.java (.../IntegrationService.java) (revision 5ea3989da5d464f07dbb65385929e7808dd15dca) +++ lams_common/src/java/org/lamsfoundation/lams/integration/service/IntegrationService.java (.../IntegrationService.java) (revision 521b542aaaa17584d68940f23bfc880f1a2ce340) @@ -921,7 +921,14 @@ public ExtUserUseridMap addExtUserToCourse(ExtServer extServer, String method, String username, String firstName, String lastName, String email, String extCourseId, String countryIsoCode, String langIsoCode, boolean usePrefix) throws UserInfoFetchException, UserInfoValidationException { + return addExtUserToCourse(extServer, method, username, firstName, lastName, email, extCourseId, null, + countryIsoCode, langIsoCode, usePrefix); + } + private ExtUserUseridMap addExtUserToCourse(ExtServer extServer, String method, String username, String firstName, + String lastName, String email, String extCourseId, String prettyCourseName, String countryIsoCode, + String langIsoCode, boolean usePrefix) throws UserInfoFetchException, UserInfoValidationException { + if (log.isDebugEnabled()) { log.debug("Adding user '" + username + "' as " + method + " to course with extCourseId '" + extCourseId + "'."); @@ -937,7 +944,7 @@ } // adds user to group - getExtCourseClassMap(extServer, userMap, extCourseId, null, method); + getExtCourseClassMap(extServer, userMap, extCourseId, prettyCourseName, method); return userMap; } @@ -946,13 +953,22 @@ public ExtUserUseridMap addExtUserToCourseAndLesson(ExtServer extServer, String method, Long lesssonId, String username, String firstName, String lastName, String email, String extCourseId, String countryIsoCode, String langIsoCode, boolean usePrefix) throws UserInfoFetchException, UserInfoValidationException { + return addExtUserToCourseAndLesson(extServer, method, lesssonId, username, firstName, lastName, email, + extCourseId, null, countryIsoCode, langIsoCode, usePrefix); + } + @Override + public ExtUserUseridMap addExtUserToCourseAndLesson(ExtServer extServer, String method, Long lesssonId, + String username, String firstName, String lastName, String email, String extCourseId, + String prettyCourseName, String countryIsoCode, String langIsoCode, boolean usePrefix) + throws UserInfoFetchException, UserInfoValidationException { + if (log.isDebugEnabled()) { log.debug("Adding user '" + username + "' as " + method + " to lesson with id '" + lesssonId + "'."); } ExtUserUseridMap userMap = addExtUserToCourse(extServer, method, username, firstName, lastName, email, - extCourseId, countryIsoCode, langIsoCode, usePrefix); + extCourseId, prettyCourseName, countryIsoCode, langIsoCode, usePrefix); User user = userMap.getUser(); if (user == null) {