You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2017/01/20 16:18:43 UTC
[36/36] isis git commit: ISIS-785: removes the setRequired for
reference and value select2
ISIS-785: removes the setRequired for reference and value select2
... because when triggered causes the floating drop-down issue to re-appear
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/bf9b97a4
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/bf9b97a4
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/bf9b97a4
Branch: refs/heads/master
Commit: bf9b97a46507178243e66eed8b28d7ca36bd5d08
Parents: a3b7770
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Fri Jan 20 16:16:39 2017 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Fri Jan 20 16:16:39 2017 +0000
----------------------------------------------------------------------
.../scalars/valuechoices/ValueChoicesSelect2Panel.java | 3 ++-
.../viewer/wicket/ui/components/widgets/select2/Select2.java | 3 ++-
.../wicket/ui/components/widgets/select2/Select2ChoiceExt.java | 6 +++++-
.../ui/components/widgets/select2/Select2MultiChoiceExt.java | 5 ++++-
4 files changed, 13 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/bf9b97a4/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/valuechoices/ValueChoicesSelect2Panel.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/valuechoices/ValueChoicesSelect2Panel.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/valuechoices/ValueChoicesSelect2Panel.java
index 27972d2..c642413 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/valuechoices/ValueChoicesSelect2Panel.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/valuechoices/ValueChoicesSelect2Panel.java
@@ -283,7 +283,8 @@ public class ValueChoicesSelect2Panel extends ScalarPanelAbstract implements Sca
@Override
public ArrayList<ObjectAdapterMemento> getMultiPending() {
- return pending != null ? pending.getList() : null;
+ final ArrayList<ObjectAdapterMemento> mementos = pending != null ? pending.getList() : null;
+ return mementos == null || mementos.isEmpty() ? null : mementos;
}
@Override
http://git-wip-us.apache.org/repos/asf/isis/blob/bf9b97a4/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/Select2.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/Select2.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/Select2.java
index 916e624..c49e4d4 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/Select2.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/Select2.java
@@ -92,7 +92,8 @@ public class Select2 implements Serializable {
}
public void setRequired(final boolean required) {
- component().setRequired(required);
+ // causing a more severe orphaned drop-down when triggered...
+ // component().setRequired(required);
}
public boolean checkRequired() {
return component().checkRequired();
http://git-wip-us.apache.org/repos/asf/isis/blob/bf9b97a4/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/Select2ChoiceExt.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/Select2ChoiceExt.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/Select2ChoiceExt.java
index e01c7b1..3dcb7a7 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/Select2ChoiceExt.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/Select2ChoiceExt.java
@@ -41,7 +41,11 @@ public class Select2ChoiceExt extends Select2Choice<ObjectAdapterMemento> implem
final ScalarModel scalarModel) {
super(id, model, EmptyChoiceProvider.INSTANCE);
specId = scalarModel.getTypeOfSpecification().getSpecId();
- setRequired(scalarModel.isRequired());
+
+ //causing a more severe orphaned drop-down when triggered...
+ //setRequired(scalarModel.isRequired());
+
+ setOutputMarkupPlaceholderTag(true);
}
@Override
http://git-wip-us.apache.org/repos/asf/isis/blob/bf9b97a4/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/Select2MultiChoiceExt.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/Select2MultiChoiceExt.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/Select2MultiChoiceExt.java
index 5f11e58..1d2d0de 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/Select2MultiChoiceExt.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/Select2MultiChoiceExt.java
@@ -51,7 +51,10 @@ public class Select2MultiChoiceExt
super(id, model, EmptyChoiceProvider.INSTANCE);
specId = scalarModel.getTypeOfSpecification().getSpecId();
- setRequired(scalarModel.isRequired());
+ //causing a more severe orphaned drop-down when triggered...
+ //setRequired(scalarModel.isRequired());
+
+ setOutputMarkupPlaceholderTag(true);
}
@Override