Repository: syncope Updated Branches: refs/heads/2_0_X 7ea4eaa38 -> 7ced59639
[SYNCOPE-1178] PlainSchema page empty while self update on Enduser Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/7ced5963 Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/7ced5963 Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/7ced5963 Branch: refs/heads/2_0_X Commit: 7ced59639e09e0343d410b8b28894fb8e4480c2d Parents: 7ea4eaa Author: skylark17 <matteo.alessandr...@tirasa.net> Authored: Wed Aug 2 09:29:18 2017 +0200 Committer: skylark17 <matteo.alessandr...@tirasa.net> Committed: Wed Aug 2 09:29:18 2017 +0200 ---------------------------------------------------------------------- .../syncope/client/enduser/resources/SchemaResource.java | 2 +- .../java/org/apache/syncope/core/logic/SyncopeLogic.java | 8 ++++---- fit/enduser-reference/src/test/resources/tests/create.js | 2 +- fit/enduser-reference/src/test/resources/tests/edit.js | 3 ++- 4 files changed, 8 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/syncope/blob/7ced5963/client/enduser/src/main/java/org/apache/syncope/client/enduser/resources/SchemaResource.java ---------------------------------------------------------------------- diff --git a/client/enduser/src/main/java/org/apache/syncope/client/enduser/resources/SchemaResource.java b/client/enduser/src/main/java/org/apache/syncope/client/enduser/resources/SchemaResource.java index 91e5bbe..36f11f4 100644 --- a/client/enduser/src/main/java/org/apache/syncope/client/enduser/resources/SchemaResource.java +++ b/client/enduser/src/main/java/org/apache/syncope/client/enduser/resources/SchemaResource.java @@ -77,7 +77,7 @@ public class SchemaResource extends BaseResource { getService(SyncopeService.class).readUserTypeExtension(group); classes = typeExt.getAuxClasses(); } catch (Exception e) { - LOG.error("Could not read User type extension for Group {}", group, e); + LOG.error("Could not read User type extension for Group {}", group); } } else { String anyTypeClass = attributes.getParameters().get("anyTypeClass").toString(); http://git-wip-us.apache.org/repos/asf/syncope/blob/7ced5963/core/logic/src/main/java/org/apache/syncope/core/logic/SyncopeLogic.java ---------------------------------------------------------------------- diff --git a/core/logic/src/main/java/org/apache/syncope/core/logic/SyncopeLogic.java b/core/logic/src/main/java/org/apache/syncope/core/logic/SyncopeLogic.java index a309214..e51a449 100644 --- a/core/logic/src/main/java/org/apache/syncope/core/logic/SyncopeLogic.java +++ b/core/logic/src/main/java/org/apache/syncope/core/logic/SyncopeLogic.java @@ -245,29 +245,29 @@ public class SyncopeLogic extends AbstractLogic<AbstractBaseBean> { PLATFORM_INFO.getEntitlements().clear(); PLATFORM_INFO.getEntitlements().addAll(EntitlementsHolder.getInstance().getValues()); - PLATFORM_INFO.getAnyTypes().clear(); - PLATFORM_INFO.getUserClasses().clear(); - PLATFORM_INFO.getAnyTypeClasses().clear(); - PLATFORM_INFO.getResources().clear(); AuthContextUtils.execWithAuthContext(AuthContextUtils.getDomain(), new AuthContextUtils.Executable<Void>() { @Override public Void exec() { + PLATFORM_INFO.getAnyTypes().clear(); CollectionUtils.collect( anyTypeDAO.findAll(), EntityUtils.keyTransformer(), PLATFORM_INFO.getAnyTypes()); + PLATFORM_INFO.getUserClasses().clear(); CollectionUtils.collect( anyTypeDAO.findUser().getClasses(), EntityUtils.keyTransformer(), PLATFORM_INFO.getUserClasses()); + PLATFORM_INFO.getAnyTypeClasses().clear(); CollectionUtils.collect( anyTypeClassDAO.findAll(), EntityUtils.keyTransformer(), PLATFORM_INFO.getAnyTypeClasses()); + PLATFORM_INFO.getResources().clear(); CollectionUtils.collect( resourceDAO.findAll(), EntityUtils.keyTransformer(), http://git-wip-us.apache.org/repos/asf/syncope/blob/7ced5963/fit/enduser-reference/src/test/resources/tests/create.js ---------------------------------------------------------------------- diff --git a/fit/enduser-reference/src/test/resources/tests/create.js b/fit/enduser-reference/src/test/resources/tests/create.js index bdf06e1..b1f049f 100644 --- a/fit/enduser-reference/src/test/resources/tests/create.js +++ b/fit/enduser-reference/src/test/resources/tests/create.js @@ -47,7 +47,7 @@ describe('syncope enduser user create', function () { selectedGroup.sendKeys('root'); element.all(by.css('.ui-select-choices-row-inner span')).first().click(); abstract.waitSpinner(); - abstract.doNext(); + element.all(by.id('next')).first().click(); //plainSchemas abstract.waitSpinner(); http://git-wip-us.apache.org/repos/asf/syncope/blob/7ced5963/fit/enduser-reference/src/test/resources/tests/edit.js ---------------------------------------------------------------------- diff --git a/fit/enduser-reference/src/test/resources/tests/edit.js b/fit/enduser-reference/src/test/resources/tests/edit.js index 9fa3f95..2c5bd44 100644 --- a/fit/enduser-reference/src/test/resources/tests/edit.js +++ b/fit/enduser-reference/src/test/resources/tests/edit.js @@ -36,7 +36,8 @@ describe('syncope enduser user edit', function () { element(by.id('login-btn')).click(); //credential - browser.wait(element(by.id('user.username')).isPresent()); + abstract.waitSpinner(); + browser.wait(element(by.model('user.username')).isPresent()); element(by.model('user.username')).clear(); element(by.model('user.username')).sendKeys('bellini'); element(by.model('user.password')).clear();
