You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by md...@apache.org on 2016/01/20 16:19:03 UTC
syncope git commit: [SYNCOPE-156] Missing markup elements
Repository: syncope
Updated Branches:
refs/heads/master 43c4d8ea8 -> de21e7165
[SYNCOPE-156] Missing markup elements
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/de21e716
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/de21e716
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/de21e716
Branch: refs/heads/master
Commit: de21e7165f8d0f102152913750c836399434aa17
Parents: 43c4d8e
Author: Marco Di Sabatino Di Diodoro <md...@apache.org>
Authored: Wed Jan 20 16:16:09 2016 +0100
Committer: Marco Di Sabatino Di Diodoro <md...@apache.org>
Committed: Wed Jan 20 16:16:43 2016 +0100
----------------------------------------------------------------------
.../panels/AnyTypeClassDetailsPanel.java | 3 +++
.../console/panels/AnyTypeDetailsPanel.java | 2 +-
.../client/console/panels/SchemaTypePanel.java | 21 ++------------------
.../markup/html/form/AjaxPalettePanel.java | 8 ++++----
.../markup/html/form/AjaxPalettePanel.html | 4 ++++
5 files changed, 14 insertions(+), 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/de21e716/client/console/src/main/java/org/apache/syncope/client/console/panels/AnyTypeClassDetailsPanel.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/panels/AnyTypeClassDetailsPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/panels/AnyTypeClassDetailsPanel.java
index a06c0dd..622ce5a 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/panels/AnyTypeClassDetailsPanel.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/panels/AnyTypeClassDetailsPanel.java
@@ -75,6 +75,7 @@ public class AnyTypeClassDetailsPanel extends Panel {
new PropertyModel<List<String>>(this.anyTypeClassTO, "plainSchemas"),
new ListModel<>(availablePlainSchemas));
+ plainSchema.hideLabel();
plainSchema.setOutputMarkupId(true);
container.add(plainSchema);
@@ -85,6 +86,7 @@ public class AnyTypeClassDetailsPanel extends Panel {
.build("derSchemas",
new PropertyModel<List<String>>(this.anyTypeClassTO, "derSchemas"),
new ListModel<>(availableDerSchemas));
+ derSchema.hideLabel();
derSchema.setOutputMarkupId(true);
container.add(derSchema);
@@ -97,6 +99,7 @@ public class AnyTypeClassDetailsPanel extends Panel {
new PropertyModel<List<String>>(this.anyTypeClassTO, "virSchemas"),
new ListModel<>(availableVirSchemas));
+ virSchema.hideLabel();
virSchema.setOutputMarkupId(true);
container.add(virSchema);
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/de21e716/client/console/src/main/java/org/apache/syncope/client/console/panels/AnyTypeDetailsPanel.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/panels/AnyTypeDetailsPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/panels/AnyTypeDetailsPanel.java
index 1226ddb..8f99675 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/panels/AnyTypeDetailsPanel.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/panels/AnyTypeDetailsPanel.java
@@ -75,7 +75,7 @@ public class AnyTypeDetailsPanel extends Panel {
form.add(new AjaxPalettePanel.Builder<String>().setAllowOrder(true).build("classes",
new PropertyModel<List<String>>(anyTypeTO, "classes"),
- new ListModel<>(getAvailableAnyTypeClasses())).setOutputMarkupId(true));
+ new ListModel<>(getAvailableAnyTypeClasses())).hideLabel().setOutputMarkupId(true));
}
private List<String> getAvailableAnyTypeClasses() {
http://git-wip-us.apache.org/repos/asf/syncope/blob/de21e716/client/console/src/main/java/org/apache/syncope/client/console/panels/SchemaTypePanel.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/panels/SchemaTypePanel.java b/client/console/src/main/java/org/apache/syncope/client/console/panels/SchemaTypePanel.java
index 95c0d29..3585783 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/panels/SchemaTypePanel.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/panels/SchemaTypePanel.java
@@ -43,7 +43,6 @@ import org.apache.syncope.client.console.wicket.markup.html.form.ActionLinksPane
import org.apache.syncope.client.console.wizards.AbstractModalPanelBuilder;
import org.apache.syncope.client.console.wizards.AjaxWizard;
import org.apache.syncope.client.console.wizards.WizardMgtPanel;
-import org.apache.syncope.common.lib.SyncopeConstants;
import org.apache.syncope.common.lib.to.AbstractSchemaTO;
import org.apache.syncope.common.lib.types.SchemaType;
import org.apache.syncope.common.lib.types.StandardEntitlement;
@@ -103,7 +102,7 @@ public class SchemaTypePanel extends AbstractTypesPanel<AbstractSchemaTO, Schema
@Override
protected WizardMgtPanel<AbstractSchemaTO> newInstance(final String id) {
- return new SchemaTypePanel(id, schemaType, this);
+ return new SchemaTypePanel(id, schemaType, this).setPageRef(pageRef);
}
}.disableCheckBoxes());
@@ -287,7 +286,7 @@ public class SchemaTypePanel extends AbstractTypesPanel<AbstractSchemaTO, Schema
} catch (Exception e) {
error(getString(Constants.ERROR) + ": " + e.getMessage());
}
- ((BasePage) getPage()).getNotificationPanel().refresh(target);
+ BasePage.class.cast(page).getNotificationPanel().refresh(target);
}
}, ActionLink.ActionType.DELETE, StandardEntitlement.SCHEMA_DELETE);
@@ -298,22 +297,6 @@ public class SchemaTypePanel extends AbstractTypesPanel<AbstractSchemaTO, Schema
return columns;
}
- private String getEnumValuesAsString(final List<String> enumerationValues) {
- final StringBuilder builder = new StringBuilder();
-
- for (String str : enumerationValues) {
- if (StringUtils.isNotBlank(str)) {
- if (builder.length() > 0) {
- builder.append(SyncopeConstants.ENUM_VALUES_SEPARATOR);
- }
-
- builder.append(str.trim());
- }
- }
-
- return builder.toString();
- }
-
protected final class SchemaProvider extends SearchableDataProvider<AbstractSchemaTO> {
private static final long serialVersionUID = -185944053385660794L;
http://git-wip-us.apache.org/repos/asf/syncope/blob/de21e716/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/AjaxPalettePanel.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/AjaxPalettePanel.java b/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/AjaxPalettePanel.java
index bdeb26c..ebbb191 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/AjaxPalettePanel.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/AjaxPalettePanel.java
@@ -50,9 +50,9 @@ public class AjaxPalettePanel<T extends Serializable> extends AbstractFieldPanel
protected Palette<T> palette;
- private final Model<String> queryFilter = new Model<String>(StringUtils.EMPTY);
+ private final Model<String> queryFilter = new Model<>(StringUtils.EMPTY);
- private final List<T> availableBefore = new ArrayList<T>();
+ private final List<T> availableBefore = new ArrayList<>();
private final LoadableDetachableModel<List<T>> choicesModel;
@@ -86,7 +86,7 @@ public class AjaxPalettePanel<T extends Serializable> extends AbstractFieldPanel
? getFilteredList(choices.getObject(), getFilter().replaceAll("\\*", "\\.\\*"))
: choices.getObject();
}
- };
+ };
initialize(model, builder);
}
@@ -209,7 +209,7 @@ public class AjaxPalettePanel<T extends Serializable> extends AbstractFieldPanel
private String availableLabel;
private boolean filtered;
-
+
private final AjaxPaletteConf conf = new AjaxPaletteConf();
private String filter = conf.getDefaultFilter();
http://git-wip-us.apache.org/repos/asf/syncope/blob/de21e716/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/AjaxPalettePanel.html
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/AjaxPalettePanel.html b/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/AjaxPalettePanel.html
index 17b6919..aaf1ffd 100644
--- a/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/AjaxPalettePanel.html
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/AjaxPalettePanel.html
@@ -27,6 +27,10 @@ under the License.
</span>
</div>
</form>
+ <wicket:enclosure child="field-label">
+ <label wicket:id="field-label">[LABEL]</label><span wicket:id="required"/>
+ <span wicket:id="externalAction"/>
+ </wicket:enclosure>
<span wicket:id="paletteField">[Palette]</span>
</wicket:extend>
</html>