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 2018/01/31 12:16:56 UTC
[isis] branch maint-1.16.1 updated (c430881 -> a2df1fd)
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a change to branch maint-1.16.1
in repository https://gitbox.apache.org/repos/asf/isis.git.
from c430881 ISIS-1849 - fixes documentation issues
new aee0b0d ISIS-1833: reinstates mandatory marker for parameters
new 6588395 ISIS-1857: adds div class=clearfix to force the help block
new a2df1fd ISIS-1813: adds -parameters' compiler argument for both helloworld and simpleapp example applications
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../java/org/apache/isis/viewer/wicket/model/models/ScalarModel.java | 2 +-
.../actionmenu/entityactions/AdditionalLinksAsDropDownPanel.html | 1 +
.../isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract2.java | 2 +-
.../viewer/wicket/ui/components/scalars/ScalarPanelSelect2Abstract.java | 2 +-
.../viewer/wicket/ui/components/scalars/primitive/BooleanPanel.java | 2 +-
example/application/helloworld/pom.xml | 2 +-
example/application/simpleapp/pom.xml | 2 +-
7 files changed, 7 insertions(+), 6 deletions(-)
--
To stop receiving notification emails like this one, please contact
danhaywood@apache.org.
[isis] 03/03: ISIS-1813: adds -parameters' compiler argument for
both helloworld and simpleapp example applications
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch maint-1.16.1
in repository https://gitbox.apache.org/repos/asf/isis.git
commit a2df1fda19116212189effe477d1b798c9bc9a5b
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Wed Jan 31 12:16:46 2018 +0000
ISIS-1813: adds -parameters' compiler argument for both helloworld and simpleapp example applications
---
example/application/helloworld/pom.xml | 2 +-
example/application/simpleapp/pom.xml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/example/application/helloworld/pom.xml b/example/application/helloworld/pom.xml
index e8339af..bb2cef0 100644
--- a/example/application/helloworld/pom.xml
+++ b/example/application/helloworld/pom.xml
@@ -40,7 +40,7 @@
<compiler-plugin.source>1.8</compiler-plugin.source>
<compiler-plugin.target>1.8</compiler-plugin.target>
- <compiler-plugin.compilerArgument></compiler-plugin.compilerArgument>
+ <compiler-plugin.compilerArgument>-parameters</compiler-plugin.compilerArgument>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
diff --git a/example/application/simpleapp/pom.xml b/example/application/simpleapp/pom.xml
index 453e292..8525106 100644
--- a/example/application/simpleapp/pom.xml
+++ b/example/application/simpleapp/pom.xml
@@ -42,7 +42,7 @@
<compiler-plugin.source>1.8</compiler-plugin.source>
<compiler-plugin.target>1.8</compiler-plugin.target>
- <compiler-plugin.compilerArgument></compiler-plugin.compilerArgument>
+ <compiler-plugin.compilerArgument>-parameters</compiler-plugin.compilerArgument>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
--
To stop receiving notification emails like this one, please contact
danhaywood@apache.org.
[isis] 02/03: ISIS-1857: adds div class=clearfix to force the help
block
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch maint-1.16.1
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 658839520ebf8836b04fabf8b54a76467fd106ea
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Wed Jan 31 12:15:41 2018 +0000
ISIS-1857: adds div class=clearfix to force the help block
to render below the field when there's a dropdown to the right
---
.../actionmenu/entityactions/AdditionalLinksAsDropDownPanel.html | 1 +
1 file changed, 1 insertion(+)
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/entityactions/AdditionalLinksAsDropDownPanel.html b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/entityactions/AdditionalLinksAsDropDownPanel.html
index 63ba317..692d158 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/entityactions/AdditionalLinksAsDropDownPanel.html
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/entityactions/AdditionalLinksAsDropDownPanel.html
@@ -38,6 +38,7 @@
</ul>
</div>
</div>
+ <div class="clearfix"/>
</wicket:panel>
</body>
</html>
--
To stop receiving notification emails like this one, please contact
danhaywood@apache.org.
[isis] 01/03: ISIS-1833: reinstates mandatory marker for parameters
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch maint-1.16.1
in repository https://gitbox.apache.org/repos/asf/isis.git
commit aee0b0d0792a4420f4207d5350c306186538c32f
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Wed Jan 31 11:45:18 2018 +0000
ISIS-1833: reinstates mandatory marker for parameters
---
.../java/org/apache/isis/viewer/wicket/model/models/ScalarModel.java | 2 +-
.../isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract2.java | 2 +-
.../viewer/wicket/ui/components/scalars/ScalarPanelSelect2Abstract.java | 2 +-
.../viewer/wicket/ui/components/scalars/primitive/BooleanPanel.java | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarModel.java b/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarModel.java
index 0f95ca0..dc37190 100644
--- a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarModel.java
+++ b/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarModel.java
@@ -976,7 +976,7 @@ public class ScalarModel extends EntityModel implements LinksProvider,FormExecut
return editable && isViewMode();
}
- boolean isEnabled() {
+ public boolean isEnabled() {
Where where = getRenderingHint().isInTable() ? Where.PARENTED_TABLES : Where.OBJECT_FORMS;
return whetherDisabled(where) == null;
}
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract2.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract2.java
index 695f971..7b9bd0f 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract2.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract2.java
@@ -589,7 +589,7 @@ public abstract class ScalarPanelAbstract2 extends PanelAbstract<ScalarModel> im
protected Label createScalarName(final String id, final String labelCaption) {
final Label scalarName = new Label(id, labelCaption);
final ScalarModel model = getModel();
- if(model.isRequired() && model.canEnterEditMode()) {
+ if(model.isRequired() && model.isEnabled()) {
final String label = scalarName.getDefaultModelObjectAsString();
if(!Strings.isNullOrEmpty(label)) {
scalarName.add(new CssClassAppender("mandatory"));
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelSelect2Abstract.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelSelect2Abstract.java
index 4cf733f..d8bba2b 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelSelect2Abstract.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelSelect2Abstract.java
@@ -98,7 +98,7 @@ public abstract class ScalarPanelSelect2Abstract extends ScalarPanelAbstract2 {
addStandardSemantics();
final ScalarModel model = getModel();
- if(model.isRequired() && model.canEnterEditMode()) {
+ if(model.isRequired() && model.isEnabled()) {
formGroup.add(new CssClassAppender("mandatory"));
}
return formGroup;
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BooleanPanel.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BooleanPanel.java
index e434f65..4e1b9ba 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BooleanPanel.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BooleanPanel.java
@@ -64,7 +64,7 @@ public class BooleanPanel extends ScalarPanelAbstract2 {
final FormGroup scalarIfRegularFormGroup = new FormGroup(ID_SCALAR_IF_REGULAR, checkBox);
scalarIfRegularFormGroup.add(checkBox);
- if(getModel().isRequired()) {
+ if(getModel().isRequired() && getModel().isEnabled()) {
scalarIfRegularFormGroup.add(new CssClassAppender("mandatory"));
}
--
To stop receiving notification emails like this one, please contact
danhaywood@apache.org.