libre.sh/keycloak-scim
2
0
Fork 0
Code Issues 14 Pull requests Releases Packages Activity Actions 6

Merge pull request #1437 from mposolda/master

Browse source 
KEYCLOAK-1505 Fix JS error in admin console on old browsers
This commit is contained in:
Marek Posolda 2015-07-09 10:33:27 +02:00
commit adb8bcf791
2 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
forms/common-themes/src/main/resources/theme/base/admin/resources/js/controllers/users.js
View file

@ -806,7 +806,7 @@ module.controller('UserFederationMapperListCtrl', function($scope, $location, No
$scope.hasAnyMapperTypes = false; $scope.hasAnyMapperTypes = false;
for (var property in mapperTypes) { for (var property in mapperTypes) {
if (!(property.startsWith('$'))) { if (!(property.indexOf('$') === 0)) {
$scope.hasAnyMapperTypes = true; $scope.hasAnyMapperTypes = true;
break; break;
} }

4
testsuite/integration/src/test/java/org/keycloak/testsuite/federation/SyncProvidersTest.java
View file

@ -155,7 +155,7 @@ public class SyncProvidersTest {
} }
@Test @Test
public void test02duplicateUsernameSync() { public void test02duplicateUsernameAndEmailSync() {
LDAPObject duplicatedLdapUser; LDAPObject duplicatedLdapUser;
KeycloakSession session = keycloakRule.startSession(); KeycloakSession session = keycloakRule.startSession();
@ -168,8 +168,6 @@ public class SyncProvidersTest {
// Add user to LDAP with duplicated username "user7" // Add user to LDAP with duplicated username "user7"
duplicatedLdapUser = FederationTestUtils.addLDAPUser(ldapFedProvider, testRealm, "user7", "User7FN", "User7LN", "user7-something@email.org", null, "126"); duplicatedLdapUser = FederationTestUtils.addLDAPUser(ldapFedProvider, testRealm, "user7", "User7FN", "User7LN", "user7-something@email.org", null, "126");
// Add user to LDAP with duplicated email "user7@email.org"
//FederationTestUtils.addLDAPUser(ldapFedProvider, testRealm, "user7-something", "User7FNN", "User7LNL", "user7@email.org", null, "126");
} finally { } finally {
keycloakRule.stopSession(session, true); keycloakRule.stopSession(session, true);
} }