You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by il...@apache.org on 2016/04/19 15:02:10 UTC
[23/24] syncope git commit: [SYNCOPE-156] Fixing key input for new
resources
[SYNCOPE-156] Fixing key input for new resources
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/dbfcc551
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/dbfcc551
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/dbfcc551
Branch: refs/heads/master
Commit: dbfcc55188c4ecacfa087c6a5fcbfd9e3869a6d3
Parents: 36dcf65
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Mon Apr 18 16:50:58 2016 +0200
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Tue Apr 19 15:01:19 2016 +0200
----------------------------------------------------------------------
.../client/console/wizards/resources/ResourceDetailsPanel.java | 5 ++---
.../client/console/wizards/resources/ResourceWizardBuilder.java | 4 ++--
.../client/console/wizards/resources/ResourceDetailsPanel.html | 2 +-
3 files changed, 5 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/dbfcc551/client/console/src/main/java/org/apache/syncope/client/console/wizards/resources/ResourceDetailsPanel.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/wizards/resources/ResourceDetailsPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/wizards/resources/ResourceDetailsPanel.java
index 7435a30..22ef2c4 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/wizards/resources/ResourceDetailsPanel.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/wizards/resources/ResourceDetailsPanel.java
@@ -53,7 +53,6 @@ public class ResourceDetailsPanel extends WizardStep {
};
public ResourceDetailsPanel(final ResourceTO resourceTO, final boolean createFlag) {
-
super();
setOutputMarkupId(true);
@@ -63,8 +62,8 @@ public class ResourceDetailsPanel extends WizardStep {
add(container);
container.add(new AjaxTextFieldPanel(
- "name",
- new ResourceModel("name", "name").
+ "key",
+ new ResourceModel("key", "key").
getObject(),
new PropertyModel<String>(resourceTO, "key"),
false).addRequiredLabel().setEnabled(createFlag));
http://git-wip-us.apache.org/repos/asf/syncope/blob/dbfcc551/client/console/src/main/java/org/apache/syncope/client/console/wizards/resources/ResourceWizardBuilder.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/wizards/resources/ResourceWizardBuilder.java b/client/console/src/main/java/org/apache/syncope/client/console/wizards/resources/ResourceWizardBuilder.java
index e46201f..03c1fec 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/wizards/resources/ResourceWizardBuilder.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/wizards/resources/ResourceWizardBuilder.java
@@ -56,9 +56,9 @@ public class ResourceWizardBuilder extends AbstractResourceWizardBuilder<Resourc
}
@Override
- public AjaxWizard<Serializable> build(final AjaxWizard.Mode mode) {
+ public AjaxWizard<Serializable> build(final String id, final AjaxWizard.Mode mode) {
this.createFlag = mode == AjaxWizard.Mode.CREATE;
- return super.build(mode);
+ return super.build(id, mode);
}
@Override
http://git-wip-us.apache.org/repos/asf/syncope/blob/dbfcc551/client/console/src/main/resources/org/apache/syncope/client/console/wizards/resources/ResourceDetailsPanel.html
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/wizards/resources/ResourceDetailsPanel.html b/client/console/src/main/resources/org/apache/syncope/client/console/wizards/resources/ResourceDetailsPanel.html
index 10b931c..5db78b8 100644
--- a/client/console/src/main/resources/org/apache/syncope/client/console/wizards/resources/ResourceDetailsPanel.html
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/wizards/resources/ResourceDetailsPanel.html
@@ -20,7 +20,7 @@ under the License.
<wicket:panel>
<div wicket:id="container" class="summarize">
<div class="form-group">
- <span wicket:id="name">[name]</span>
+ <span wicket:id="key">[key]</span>
</div>
<div class="form-group">