Index: lams_build/lib/lams/lams.jar =================================================================== diff -u -re08b873af178aec14f4a58df17f0f34a47931069 -r2d4d19ec67fe859af0cd7a0e55d1c45e34fac988 Binary files differ Index: lams_central/src/java/org/lamsfoundation/lams/web/OrganisationGroupAction.java =================================================================== diff -u -r2a453fc72f50cf05bc324019cbe11322aebc91e2 -r2d4d19ec67fe859af0cd7a0e55d1c45e34fac988 --- lams_central/src/java/org/lamsfoundation/lams/web/OrganisationGroupAction.java (.../OrganisationGroupAction.java) (revision 2a453fc72f50cf05bc324019cbe11322aebc91e2) +++ lams_central/src/java/org/lamsfoundation/lams/web/OrganisationGroupAction.java (.../OrganisationGroupAction.java) (revision 2d4d19ec67fe859af0cd7a0e55d1c45e34fac988) @@ -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 =================================================================== diff -u -rd27ed028b0e16c263776418b7bce22099fed4eed -r2d4d19ec67fe859af0cd7a0e55d1c45e34fac988 --- lams_common/src/java/org/lamsfoundation/lams/integration/service/IIntegrationService.java (.../IIntegrationService.java) (revision d27ed028b0e16c263776418b7bce22099fed4eed) +++ lams_common/src/java/org/lamsfoundation/lams/integration/service/IIntegrationService.java (.../IIntegrationService.java) (revision 2d4d19ec67fe859af0cd7a0e55d1c45e34fac988) @@ -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 =================================================================== diff -u -rd27ed028b0e16c263776418b7bce22099fed4eed -r2d4d19ec67fe859af0cd7a0e55d1c45e34fac988 --- lams_common/src/java/org/lamsfoundation/lams/integration/service/IntegrationService.java (.../IntegrationService.java) (revision d27ed028b0e16c263776418b7bce22099fed4eed) +++ lams_common/src/java/org/lamsfoundation/lams/integration/service/IntegrationService.java (.../IntegrationService.java) (revision 2d4d19ec67fe859af0cd7a0e55d1c45e34fac988) @@ -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