Index: lams_build/lib/lams/lams.jar =================================================================== RCS file: /usr/local/cvsroot/lams_build/lib/lams/lams.jar,v diff -u -r1.476 -r1.477 Binary files differ Index: lams_central/src/java/org/lamsfoundation/lams/web/OrganisationGroupAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/web/OrganisationGroupAction.java,v diff -u -r1.12 -r1.13 --- lams_central/src/java/org/lamsfoundation/lams/web/OrganisationGroupAction.java 2 Dec 2015 20:00:44 -0000 1.12 +++ lams_central/src/java/org/lamsfoundation/lams/web/OrganisationGroupAction.java 15 Dec 2015 17:30:44 -0000 1.13 @@ -191,7 +191,7 @@ request.setAttribute(AttributeNames.PARAM_ORGANISATION_ID, organisationId); // if this is a chosen group and lesson is created using integrations - show groups received from LMS instead of actual LAMS ones - if (lessonId != null && getIntegrationService().isLessonCreatedUsingIntegrations(lessonId)) { + if (lessonId != null && getIntegrationService().isIntegratedServerGroupFetchingAvailable(lessonId)) { List extGroups = getIntegrationService().getExtGroups(lessonId, null); request.setAttribute("extGroups", extGroups); // TODO ? show only with user number >0 Index: lams_common/src/java/org/lamsfoundation/lams/integration/service/IIntegrationService.java =================================================================== RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/integration/service/IIntegrationService.java,v diff -u -r1.18 -r1.19 --- lams_common/src/java/org/lamsfoundation/lams/integration/service/IIntegrationService.java 1 Dec 2015 22:27:40 -0000 1.18 +++ lams_common/src/java/org/lamsfoundation/lams/integration/service/IIntegrationService.java 15 Dec 2015 17:30:33 -0000 1.19 @@ -150,12 +150,14 @@ String getLessonFinishCallbackUrl(User user, Lesson lesson) throws UnsupportedEncodingException; /** - * Checks whether lesson was created using integrations. + * Checks whether lesson was created using integrations and whether according integrated server has ExtGroupsUrl + * property set up. * * @param lessonId - * @return true in case lesson was created using integrations, false otherwise + * @return true in case lesson was created using integrations and according integrated server has ExtGroupsUrl + * property set up, false otherwise */ - boolean isLessonCreatedUsingIntegrations(Long lessonId); + boolean isIntegratedServerGroupFetchingAvailable(Long lessonId); List getExtGroups(Long lessonId, String[] extGroupIds) throws Exception; } Index: lams_common/src/java/org/lamsfoundation/lams/integration/service/IntegrationService.java =================================================================== RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/integration/service/IntegrationService.java,v diff -u -r1.36 -r1.37 --- lams_common/src/java/org/lamsfoundation/lams/integration/service/IntegrationService.java 1 Dec 2015 22:27:40 -0000 1.36 +++ lams_common/src/java/org/lamsfoundation/lams/integration/service/IntegrationService.java 15 Dec 2015 17:30:33 -0000 1.37 @@ -578,15 +578,17 @@ } @Override - public boolean isLessonCreatedUsingIntegrations(Long lessonId) { + public boolean isIntegratedServerGroupFetchingAvailable(Long lessonId) { - boolean isLessonCreatedByIntegratedServer = false; + boolean isIntegratedServerGroupFetchingAvailable = false; if (lessonId != null) { ExtServerLessonMap extServerLesson = getExtServerLessonMap(lessonId); - isLessonCreatedByIntegratedServer = extServerLesson != null; + + isIntegratedServerGroupFetchingAvailable = (extServerLesson != null) + && StringUtils.isNotBlank(extServerLesson.getExtServer().getExtGroupsUrl()); } - return isLessonCreatedByIntegratedServer; + return isIntegratedServerGroupFetchingAvailable; } @Override