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 2016/10/26 15:08:54 UTC
[1/4] isis git commit: ISIS-1518: added option to disable breadcrumb
selector
Repository: isis
Updated Branches:
refs/heads/maint-1.13.1 43a2bd58d -> 5df58cbd3
ISIS-1518: added option to disable breadcrumb selector
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/4696b85e
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/4696b85e
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/4696b85e
Branch: refs/heads/maint-1.13.1
Commit: 4696b85ea0f07eb1ce6990fe345d5be3bc0b64c6
Parents: 43a2bd5
Author: bibryam <red2KIDS>
Authored: Mon Oct 17 11:15:43 2016 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Wed Oct 26 15:38:51 2016 +0100
----------------------------------------------------------------------
.../widgets/breadcrumbs/BreadcrumbModel.java | 1 -
.../widgets/breadcrumbs/BreadcrumbPanel.java | 18 +++++++++++++++++-
2 files changed, 17 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/4696b85e/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbModel.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbModel.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbModel.java
index 8311498..637e232 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbModel.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbModel.java
@@ -128,7 +128,6 @@ public class BreadcrumbModel implements Serializable {
}
-
void remove(final String rootOid) {
final EntityModel existingModel = entityModelByOidStr.get(rootOid);
if(existingModel != null) {
http://git-wip-us.apache.org/repos/asf/isis/blob/4696b85e/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbPanel.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbPanel.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbPanel.java
index 07be860..6fa1496 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbPanel.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbPanel.java
@@ -23,6 +23,7 @@ import com.google.common.base.Predicate;
import com.google.common.collect.Iterables;
import com.google.common.collect.Lists;
+import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;
import org.apache.wicket.model.IModel;
@@ -43,6 +44,11 @@ public class BreadcrumbPanel extends PanelAbstract<IModel<Void>> {
private static final long serialVersionUID = 1L;
private static final String ID_BREADCRUMBS = "breadcrumbs";
+ /**
+ * A configuration setting which value determines whether the breadcrumbs should be available in the footer
+ */
+ private static final String SHOW_BREADCRUMBS_KEY = "isis.viewer.wicket.breadcrumbs.showChooser";
+ private static final boolean SHOW_BREADCRUMBS_DEFAULT = true;
public BreadcrumbPanel(String id) {
super(id);
@@ -122,5 +128,15 @@ public class BreadcrumbPanel extends PanelAbstract<IModel<Void>> {
addOrReplace(breadcrumbChoice);
}
-
+ @Override
+ protected void onConfigure() {
+ super.onConfigure();
+
+ boolean shouldShow = getConfiguration().getBoolean(SHOW_BREADCRUMBS_KEY, SHOW_BREADCRUMBS_DEFAULT);
+ setVisible(shouldShow);
+ }
+
+ private IsisConfiguration getConfiguration() {
+ return getIsisSessionFactory().getConfiguration();
+ }
}
[2/4] isis git commit: Added docs for disabling breadcrumbs chooser
Posted by da...@apache.org.
Added docs for disabling breadcrumbs chooser
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/bb0c6ab2
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/bb0c6ab2
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/bb0c6ab2
Branch: refs/heads/maint-1.13.1
Commit: bb0c6ab2ccaab75a4f378a3587ae711df949247a
Parents: 4696b85
Author: bibryam <red2KIDS>
Authored: Sat Oct 22 14:09:02 2016 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Wed Oct 26 15:39:06 2016 +0100
----------------------------------------------------------------------
.../main/asciidoc/guides/_ugvw_configuration-properties.adoc | 5 +++++
1 file changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/bb0c6ab2/adocs/documentation/src/main/asciidoc/guides/_ugvw_configuration-properties.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_ugvw_configuration-properties.adoc b/adocs/documentation/src/main/asciidoc/guides/_ugvw_configuration-properties.adoc
index 3e4a738..f01f52d 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_ugvw_configuration-properties.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_ugvw_configuration-properties.adoc
@@ -43,6 +43,11 @@ If you prefer you can place all configuration properties into `WEB-INF/isis.prop
| number of pages to bookmark
|`isis.viewer.wicket.` +
+`breadcrumbs.showChooser`
+| `true`,`false` (`_true_`)
+| Whether to show chooser for Breadcrumbs
+
+|`isis.viewer.wicket.` +
`datePattern`
| date format +
(`dd-MM-yyyy`)
[3/4] isis git commit: Fix DateTime marshalling in
JodaLocalDateValueSemanticsProvider
Posted by da...@apache.org.
Fix DateTime marshalling in JodaLocalDateValueSemanticsProvider
This implementation of JodaLocalDateTimeValueSemanticsProvider,
given that
```
encodingFormatter = ISODateTimeFormat.basicDateTime()
```
assumes that
```
date == encodingFormatter.parseLocalDateTime(
encodingFormatter.print(date)
)
```
which is not true (at least for the latest ver. 2.9.4 of joda-time).
Provided solution confirms with Java 8 java.time.format.DateTimeFormatter.ISO_LOCAL_DATE_TIME which uses yyyy-MM-dd'T'HH:mm:ss
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/d038b2d4
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/d038b2d4
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/d038b2d4
Branch: refs/heads/maint-1.13.1
Commit: d038b2d4126c499257c8c263afcb3baf6dc9925b
Parents: bb0c6ab
Author: Andi Huber <ho...@gmx.at>
Authored: Mon Oct 3 09:38:04 2016 +0200
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Wed Oct 26 15:39:18 2016 +0100
----------------------------------------------------------------------
.../datetimejodalocal/JodaLocalDateTimeValueSemanticsProvider.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/d038b2d4/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/datetimejodalocal/JodaLocalDateTimeValueSemanticsProvider.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/datetimejodalocal/JodaLocalDateTimeValueSemanticsProvider.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/datetimejodalocal/JodaLocalDateTimeValueSemanticsProvider.java
index 4c84b75..439a224 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/datetimejodalocal/JodaLocalDateTimeValueSemanticsProvider.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/datetimejodalocal/JodaLocalDateTimeValueSemanticsProvider.java
@@ -126,7 +126,7 @@ public class JodaLocalDateTimeValueSemanticsProvider extends ValueSemanticsProvi
private static final LocalDateTime DEFAULT_VALUE = null;
- private final DateTimeFormatter encodingFormatter = ISODateTimeFormat.basicDateTime();
+ private final DateTimeFormatter encodingFormatter = ISODateTimeFormat.dateHourMinuteSecond();
private DateTimeFormatter titleStringFormatter;
private String titleStringFormatNameOrPattern;
[4/4] isis git commit: ISIS-1480: uses dateHourMinuteSecondMillis for
JodaLocalDateTimeValueSemanticsProvider's encoding/restore
Posted by da...@apache.org.
ISIS-1480: uses dateHourMinuteSecondMillis for JodaLocalDateTimeValueSemanticsProvider's encoding/restore
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/5df58cbd
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/5df58cbd
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/5df58cbd
Branch: refs/heads/maint-1.13.1
Commit: 5df58cbd37c8f2f87caf9cad47fa3104b3e03201
Parents: d038b2d
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Wed Oct 26 15:32:09 2016 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Wed Oct 26 15:39:47 2016 +0100
----------------------------------------------------------------------
...JodaLocalDateTimeValueSemanticsProvider.java | 2 +-
...LocalDateTimeValueSemanticsProviderTest.java | 63 ++++++++++++++++++++
2 files changed, 64 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/5df58cbd/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/datetimejodalocal/JodaLocalDateTimeValueSemanticsProvider.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/datetimejodalocal/JodaLocalDateTimeValueSemanticsProvider.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/datetimejodalocal/JodaLocalDateTimeValueSemanticsProvider.java
index 439a224..3003633 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/datetimejodalocal/JodaLocalDateTimeValueSemanticsProvider.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/datetimejodalocal/JodaLocalDateTimeValueSemanticsProvider.java
@@ -126,7 +126,7 @@ public class JodaLocalDateTimeValueSemanticsProvider extends ValueSemanticsProvi
private static final LocalDateTime DEFAULT_VALUE = null;
- private final DateTimeFormatter encodingFormatter = ISODateTimeFormat.dateHourMinuteSecond();
+ private final DateTimeFormatter encodingFormatter = ISODateTimeFormat.dateHourMinuteSecondMillis();
private DateTimeFormatter titleStringFormatter;
private String titleStringFormatNameOrPattern;
http://git-wip-us.apache.org/repos/asf/isis/blob/5df58cbd/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/datetimejodalocal/JodaLocalDateTimeValueSemanticsProviderTest.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/datetimejodalocal/JodaLocalDateTimeValueSemanticsProviderTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/datetimejodalocal/JodaLocalDateTimeValueSemanticsProviderTest.java
new file mode 100644
index 0000000..8354a02
--- /dev/null
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/datetimejodalocal/JodaLocalDateTimeValueSemanticsProviderTest.java
@@ -0,0 +1,63 @@
+package org.apache.isis.core.metamodel.facets.value.datetimejodalocal;
+
+import org.jmock.Expectations;
+import org.jmock.auto.Mock;
+import org.joda.time.LocalDateTime;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+
+import org.apache.isis.core.commons.config.IsisConfigurationDefault;
+import org.apache.isis.core.metamodel.facetapi.FacetHolder;
+import org.apache.isis.core.metamodel.services.ServicesInjector;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
+
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+
+public class JodaLocalDateTimeValueSemanticsProviderTest {
+
+ @Rule
+ public JUnitRuleMockery2 context = JUnitRuleMockery2.createFor(JUnitRuleMockery2.Mode.INTERFACES_AND_CLASSES);
+
+ @Mock
+ FacetHolder mockFacetHolder;
+
+ @Mock
+ ServicesInjector mockServicesInjector;
+
+ @Mock
+ IsisConfigurationDefault mockConfiguration;
+
+ JodaLocalDateTimeValueSemanticsProvider provider;
+
+ @Before
+ public void setUp() throws Exception {
+ context.checking(new Expectations() {{
+
+ ignoring(mockFacetHolder);
+
+ allowing(mockServicesInjector).getConfigurationServiceInternal();
+ will(returnValue(mockConfiguration));
+
+ allowing(mockConfiguration).getString("isis.value.format.datetime","medium");
+ will(returnValue("iso_encoding"));
+ }});
+
+ provider = new JodaLocalDateTimeValueSemanticsProvider(mockFacetHolder, mockServicesInjector);
+
+ }
+
+ @Test
+ public void roundtrip() throws Exception {
+
+ final LocalDateTime t0 = LocalDateTime.now();
+
+ final String encoded = provider.doEncode(t0);
+ final LocalDateTime t1 = provider.doRestore(encoded);
+
+ assertThat(t0, is(equalTo(t1)));
+ }
+
+}
\ No newline at end of file