Repository: syncope Updated Branches: refs/heads/2_0_X 78ab71e43 -> 08702cc79 refs/heads/master d0dc9b35f -> 2fbe7fb20
[SYNCOPE-1031] removed key field from security question details Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/28e171b1 Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/28e171b1 Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/28e171b1 Branch: refs/heads/2_0_X Commit: 28e171b1cd2a829b464655e030ae939f868a8d9b Parents: 78ab71e Author: fmartelli <fabio.marte...@gmail.com> Authored: Mon Feb 27 16:06:26 2017 +0100 Committer: fmartelli <fabio.marte...@gmail.com> Committed: Mon Feb 27 16:06:26 2017 +0100 ---------------------------------------------------------------------- .../client/console/panels/SecurityQuestionDetailsPanel.java | 7 ------- .../client/console/panels/SecurityQuestionDetailsPanel.html | 3 --- .../apache/syncope/fit/console/SecurityQuestionsITCase.java | 8 ++++---- 3 files changed, 4 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/syncope/blob/28e171b1/client/console/src/main/java/org/apache/syncope/client/console/panels/SecurityQuestionDetailsPanel.java ---------------------------------------------------------------------- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/panels/SecurityQuestionDetailsPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/panels/SecurityQuestionDetailsPanel.java index d7a70a1..3f632fb 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/panels/SecurityQuestionDetailsPanel.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/panels/SecurityQuestionDetailsPanel.java @@ -43,13 +43,6 @@ public class SecurityQuestionDetailsPanel extends Panel { form.setModel(new CompoundPropertyModel<>(securityQuestionTO)); container.add(form); - final AjaxTextFieldPanel key = new AjaxTextFieldPanel( - "key", getString("key"), new PropertyModel<String>(securityQuestionTO, "key")); - key.addRequiredLabel(); - final String keyModelObject = String.valueOf(key.getModelObject()); - key.setEnabled(keyModelObject == null || keyModelObject.isEmpty()); - form.add(key); - final AjaxTextFieldPanel content = new AjaxTextFieldPanel( "content", getString("content"), new PropertyModel<String>(securityQuestionTO, "content")); content.addRequiredLabel(); http://git-wip-us.apache.org/repos/asf/syncope/blob/28e171b1/client/console/src/main/resources/org/apache/syncope/client/console/panels/SecurityQuestionDetailsPanel.html ---------------------------------------------------------------------- diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/panels/SecurityQuestionDetailsPanel.html b/client/console/src/main/resources/org/apache/syncope/client/console/panels/SecurityQuestionDetailsPanel.html index 153d686..85f1674 100644 --- a/client/console/src/main/resources/org/apache/syncope/client/console/panels/SecurityQuestionDetailsPanel.html +++ b/client/console/src/main/resources/org/apache/syncope/client/console/panels/SecurityQuestionDetailsPanel.html @@ -22,9 +22,6 @@ under the License. <div class="form-group"> <form wicket:id="form"> <div class="form-group"> - <span wicket:id="key">[key]</span> - </div> - <div class="form-group"> <span wicket:id="content">[content]</span> </div> </form> http://git-wip-us.apache.org/repos/asf/syncope/blob/28e171b1/fit/core-reference/src/test/java/org/apache/syncope/fit/console/SecurityQuestionsITCase.java ---------------------------------------------------------------------- diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/console/SecurityQuestionsITCase.java b/fit/core-reference/src/test/java/org/apache/syncope/fit/console/SecurityQuestionsITCase.java index 50aa667..9eabac7 100644 --- a/fit/core-reference/src/test/java/org/apache/syncope/fit/console/SecurityQuestionsITCase.java +++ b/fit/core-reference/src/test/java/org/apache/syncope/fit/console/SecurityQuestionsITCase.java @@ -40,7 +40,7 @@ public class SecurityQuestionsITCase extends AbstractConsoleITCase { TESTER.assertRenderedPage(SecurityQuestions.class); } - private void createRealm(final String name) { + private void createSecurityQuestion(final String name) { TESTER.clickLink("body:content:securityQuestionPanel:container:content:add"); TESTER.assertComponent( @@ -76,12 +76,12 @@ public class SecurityQuestionsITCase extends AbstractConsoleITCase { @Test public void create() { - createRealm("What's your preferred team?"); + createSecurityQuestion("What's your preferred team?"); } @Test public void update() { - createRealm("What's your preferred color?"); + createSecurityQuestion("What's your preferred color?"); Component result = findComponentByProp("content", "body:content:securityQuestionPanel:container:content:" + "searchContainer:resultTable:tablePanel:groupForm:checkgroup:dataTable", "What's your preferred color?"); @@ -105,7 +105,7 @@ public class SecurityQuestionsITCase extends AbstractConsoleITCase { @Test public void delete() { String name = "What's your preferred color?"; - createRealm(name); + createSecurityQuestion(name); Component result = findComponentByProp("content", "body:content:securityQuestionPanel:container:content:" + "searchContainer:resultTable:tablePanel:groupForm:checkgroup:dataTable",
