Index: lams_admin/conf/language/lams/ApplicationResources.properties =================================================================== diff -u -r8af1f7ba45d2ed7f050169ad43dce290f53661cf -rac4d536a03727d777f942460c2e246ba2940b581 --- lams_admin/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision 8af1f7ba45d2ed7f050169ad43dce290f53661cf) +++ lams_admin/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision ac4d536a03727d777f942460c2e246ba2940b581) @@ -633,7 +633,7 @@ label.type.logout = User logout label.type.config.change = Configuration change outcome.authoring.remove.confirm = Are you sure you want to remove this learning outcome? -sysadmin.alternative.user.id.name = Use alternative parameter name "lis_person_sourcedid" to get user id +sysadmin.user.id.name =Parameter name to get user id config.header.privacy.settings = Privacy settings config.restricted.displaying.user.names.in.groupings = Groupings: only display names for learners within own group sysadmin.maintain.session.count = logged in users Index: lams_admin/conf/language/lams/ApplicationResources_el_GR.properties =================================================================== diff -u -r625a1082501027cf4b35af4cebcf34178d0bec67 -rac4d536a03727d777f942460c2e246ba2940b581 --- lams_admin/conf/language/lams/ApplicationResources_el_GR.properties (.../ApplicationResources_el_GR.properties) (revision 625a1082501027cf4b35af4cebcf34178d0bec67) +++ lams_admin/conf/language/lams/ApplicationResources_el_GR.properties (.../ApplicationResources_el_GR.properties) (revision ac4d536a03727d777f942460c2e246ba2940b581) @@ -633,7 +633,6 @@ label.type.logout = Αποσύνδεση χρήστη label.type.config.change = Αλλαγή διαμόρφωσης outcome.authoring.remove.confirm = Είστε βέβαιοι ότι θέλετε να καταργήσετε αυτό το μαθησιακό αποτέλεσμα; -sysadmin.alternative.user.id.name = Χρησιμοποιήστε το εναλλακτικό όνομα παραμέτρου "lis_person_sourcedid" για να λάβετε όνομα χρήστη config.header.privacy.settings = Ρυθμίσεις απορρήτου config.restricted.displaying.user.names.in.groupings = Ομαδοποιήσεις: εμφανίζονται μόνο ονόματα εκπαιδευόμενων μέσα στην ίδια ομάδα sysadmin.maintain.session.count = συνδεδεμένοι χρήστες Index: lams_admin/conf/language/lams/ApplicationResources_en_AU.properties =================================================================== diff -u -rf261ba7a9ca7dab17afdd50a79ca85fd18b0aae9 -rac4d536a03727d777f942460c2e246ba2940b581 --- lams_admin/conf/language/lams/ApplicationResources_en_AU.properties (.../ApplicationResources_en_AU.properties) (revision f261ba7a9ca7dab17afdd50a79ca85fd18b0aae9) +++ lams_admin/conf/language/lams/ApplicationResources_en_AU.properties (.../ApplicationResources_en_AU.properties) (revision ac4d536a03727d777f942460c2e246ba2940b581) @@ -633,7 +633,6 @@ label.type.logout = User logout label.type.config.change = Configuration change outcome.authoring.remove.confirm = Are you sure you want to remove this learning outcome? -sysadmin.alternative.user.id.name = Use alternative parameter name "lis_person_sourcedid" to get user id config.header.privacy.settings = Privacy settings config.restricted.displaying.user.names.in.groupings = Groupings: only display names for learners within own group sysadmin.maintain.session.count = logged in users Index: lams_admin/conf/language/lams/ApplicationResources_es_ES.properties =================================================================== diff -u -rf261ba7a9ca7dab17afdd50a79ca85fd18b0aae9 -rac4d536a03727d777f942460c2e246ba2940b581 --- lams_admin/conf/language/lams/ApplicationResources_es_ES.properties (.../ApplicationResources_es_ES.properties) (revision f261ba7a9ca7dab17afdd50a79ca85fd18b0aae9) +++ lams_admin/conf/language/lams/ApplicationResources_es_ES.properties (.../ApplicationResources_es_ES.properties) (revision ac4d536a03727d777f942460c2e246ba2940b581) @@ -633,7 +633,6 @@ label.type.logout = Usuario cierra sesión label.type.config.change = Cambio de configuración outcome.authoring.remove.confirm = ¿Está seguro que desea eliminar? -sysadmin.alternative.user.id.name = Utilizar parámetro alternativo con nombres "lis_person_sourceid" como user id config.header.privacy.settings = Configuraciones de privacidad config.restricted.displaying.user.names.in.groupings = Grupos: solo mostrar los nombres de estudiantes que están en el mismo grupo. sysadmin.maintain.session.count = usuarios conectados. Index: lams_admin/conf/language/lams/ApplicationResources_no_NO.properties =================================================================== diff -u -r625a1082501027cf4b35af4cebcf34178d0bec67 -rac4d536a03727d777f942460c2e246ba2940b581 --- lams_admin/conf/language/lams/ApplicationResources_no_NO.properties (.../ApplicationResources_no_NO.properties) (revision 625a1082501027cf4b35af4cebcf34178d0bec67) +++ lams_admin/conf/language/lams/ApplicationResources_no_NO.properties (.../ApplicationResources_no_NO.properties) (revision ac4d536a03727d777f942460c2e246ba2940b581) @@ -633,7 +633,6 @@ label.type.logout = Bruker logg ut label.type.config.change = Endring av oppsett outcome.authoring.remove.confirm = Er du sikker på at du vil fjerne dette læreresultatet ? -sysadmin.alternative.user.id.name = Bruk et alternativt parameter navn "lis_person_sourcedid" for å få bruker id config.header.privacy.settings = Oppsett for personvern config.restricted.displaying.user.names.in.groupings = Gruppering: viser kun navn for studenter egen gruppe sysadmin.maintain.session.count = innloggede brukere Index: lams_common/src/java/org/lamsfoundation/lams/integration/service/IntegrationService.java =================================================================== diff -u -rd81ac4dedc395c754e069d33a41b079cc82e0cf8 -rac4d536a03727d777f942460c2e246ba2940b581 --- lams_common/src/java/org/lamsfoundation/lams/integration/service/IntegrationService.java (.../IntegrationService.java) (revision d81ac4dedc395c754e069d33a41b079cc82e0cf8) +++ lams_common/src/java/org/lamsfoundation/lams/integration/service/IntegrationService.java (.../IntegrationService.java) (revision ac4d536a03727d777f942460c2e246ba2940b581) @@ -1021,8 +1021,9 @@ //get user id using "userId" property, or "sourcedId" if UseAlternativeUseridParameterName option is ON for this LTI server JsonNode lisPersonSourcedid = member.get("sourcedId"); - String extUserId = extServer.getUseAlternativeUseridParameterName() && lisPersonSourcedid != null - && StringUtils.isNotBlank(lisPersonSourcedid.asText()) ? lisPersonSourcedid.asText() + String extUserId = extServer.getUserIdParameterName().equalsIgnoreCase("lis_person_sourcedid") + && lisPersonSourcedid != null && StringUtils.isNotBlank(lisPersonSourcedid.asText()) + ? lisPersonSourcedid.asText() : member.get("userId").asText(); //to address Moodle version 3.7.1 bug