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 2014/02/19 14:33:29 UTC
[1/5] git commit: ISIS-667: increase size of PublishedEventJdo's
title column
Repository: isis
Updated Branches:
refs/heads/master 9fabeb05d -> 27d98b384
ISIS-667: increase size of PublishedEventJdo's title column
from 50 to 255.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/77bc29a8
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/77bc29a8
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/77bc29a8
Branch: refs/heads/master
Commit: 77bc29a8ba29bd7e1434f605db23ea239a77a21e
Parents: 9fabeb0
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Wed Feb 19 12:56:10 2014 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Wed Feb 19 13:33:03 2014 +0000
----------------------------------------------------------------------
.../isis/objectstore/jdo/applib/service/JdoColumnLength.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/77bc29a8/component/objectstore/jdo/jdo-applib/src/main/java/org/apache/isis/objectstore/jdo/applib/service/JdoColumnLength.java
----------------------------------------------------------------------
diff --git a/component/objectstore/jdo/jdo-applib/src/main/java/org/apache/isis/objectstore/jdo/applib/service/JdoColumnLength.java b/component/objectstore/jdo/jdo-applib/src/main/java/org/apache/isis/objectstore/jdo/applib/service/JdoColumnLength.java
index ca3a42a..ef6ca00 100644
--- a/component/objectstore/jdo/jdo-applib/src/main/java/org/apache/isis/objectstore/jdo/applib/service/JdoColumnLength.java
+++ b/component/objectstore/jdo/jdo-applib/src/main/java/org/apache/isis/objectstore/jdo/applib/service/JdoColumnLength.java
@@ -70,7 +70,7 @@ public final class JdoColumnLength {
private PublishedEvent() {
}
- public static final int TITLE = 50;
+ public static final int TITLE = 255;
public static final int EVENT_TYPE = 20;
public static final int STATE = 20;
}
[2/5] git commit: ISIS-677: further blob/clob fixes & enhancements
Posted by da...@apache.org.
ISIS-677: further blob/clob fixes & enhancements
1. failed to render if in compact mode (ie in a table)
- error in the wicket component hierarchy
2. show filename when in edit mode
3. in edit mode, if hit clear, then clear the filename also
4. in compact (table) mode, if blob to download, then show as title of download link
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/3d36f493
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/3d36f493
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/3d36f493
Branch: refs/heads/master
Commit: 3d36f493681d016e95bc01cff7c19097aea15732
Parents: 77bc29a
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Wed Feb 19 13:02:34 2014 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Wed Feb 19 13:33:04 2014 +0000
----------------------------------------------------------------------
.../isisapplib/IsisBlobOrClobPanelAbstract.html | 2 +-
.../isisapplib/IsisBlobOrClobPanelAbstract.java | 29 +++++++++++++-------
2 files changed, 20 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/3d36f493/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisBlobOrClobPanelAbstract.html
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisBlobOrClobPanelAbstract.html b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisBlobOrClobPanelAbstract.html
index 2de4ff2..7b1aa4a 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisBlobOrClobPanelAbstract.html
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisBlobOrClobPanelAbstract.html
@@ -39,7 +39,7 @@
</label>
<span wicket:id="scalarIfCompact">
- <a wicket:id="scalarIfCompactDownload">Download</a>
+ <a wicket:id="scalarIfCompactDownload"><span class="fileName" wicket:id="fileNameIfCompact"></span></a>
</span>
</div>
http://git-wip-us.apache.org/repos/asf/isis/blob/3d36f493/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisBlobOrClobPanelAbstract.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisBlobOrClobPanelAbstract.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisBlobOrClobPanelAbstract.java
index 70a1db7..2edbbac 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisBlobOrClobPanelAbstract.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisBlobOrClobPanelAbstract.java
@@ -78,6 +78,7 @@ public abstract class IsisBlobOrClobPanelAbstract<T extends NamedWithMimeType> e
private Image wicketImage;
private FileUploadField fileUploadField;
+ private Label fileNameLabel;
protected enum InputFieldVisibility {
VISIBLE, NOT_VISIBLE;
@@ -162,8 +163,10 @@ public abstract class IsisBlobOrClobPanelAbstract<T extends NamedWithMimeType> e
@Override
protected Component addComponentForCompact() {
final MarkupContainer scalarIfCompact = new WebMarkupContainer(ID_SCALAR_IF_COMPACT);
- updateDownloadLink(ID_SCALAR_IF_COMPACT_DOWNLOAD, scalarIfCompact);
- updateFileNameLabel(ID_FILE_NAME, scalarIfCompact);
+ MarkupContainer downloadLink = updateDownloadLink(ID_SCALAR_IF_COMPACT_DOWNLOAD, scalarIfCompact);
+ if(downloadLink != null) {
+ updateFileNameLabel("fileNameIfCompact", downloadLink);
+ }
addOrReplace(scalarIfCompact);
return scalarIfCompact;
}
@@ -226,16 +229,13 @@ public abstract class IsisBlobOrClobPanelAbstract<T extends NamedWithMimeType> e
MarkupContainer formComponent = (MarkupContainer) getComponentForRegular();
formComponent.get(ID_SCALAR_VALUE).setVisible(visibility == InputFieldVisibility.VISIBLE);
+ fileNameLabel = updateFileNameLabel(ID_FILE_NAME, formComponent);
+
updateClearLink(visibility);
-
- Label fileNameLabel = updateFileNameLabel(ID_FILE_NAME, formComponent);
// the visibility of download link is intentionally 'backwards';
// if in edit mode then do NOT show
- fileNameLabel.setVisible(visibility != InputFieldVisibility.VISIBLE);
-
final MarkupContainer downloadLink = updateDownloadLink(ID_SCALAR_IF_REGULAR_DOWNLOAD, formComponent);
- // ditto the download link
if (downloadLink != null) {
downloadLink.setVisible(visibility == InputFieldVisibility.NOT_VISIBLE);
}
@@ -246,10 +246,18 @@ public abstract class IsisBlobOrClobPanelAbstract<T extends NamedWithMimeType> e
}
private Label updateFileNameLabel(String idFileName, MarkupContainer formComponent) {
- T blobOrClob = getBlobOrClobFromModel();
- String fileName = blobOrClob != null? blobOrClob.getName(): "";
- Label fileNameLabel = new Label(idFileName, Model.of(fileName));
+ class FileNameModel extends Model<String> {
+ private static final long serialVersionUID = 1L;
+ @Override
+ public String getObject() {
+ T blobOrClob = getBlobOrClobFromModel();
+ String fileName = blobOrClob != null? blobOrClob.getName(): "";
+ return fileName;
+ }
+ }
+ Label fileNameLabel = new Label(idFileName, new FileNameModel());
formComponent.addOrReplace(fileNameLabel);
+ fileNameLabel.setOutputMarkupId(true);
return fileNameLabel;
}
@@ -266,6 +274,7 @@ public abstract class IsisBlobOrClobPanelAbstract<T extends NamedWithMimeType> e
ScalarModel model = IsisBlobOrClobPanelAbstract.this.getModel();
model.setObject(null);
target.add(formComponent);
+ target.add(fileNameLabel);
}
};
ajaxLink.setOutputMarkupId(true);
[5/5] git commit: ISIS-695: removing 3rd party extension comments
from example apps
Posted by da...@apache.org.
ISIS-695: removing 3rd party extension comments from example apps
in their 'pom.xml's:
- quickstart app
- simple app
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/27d98b38
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/27d98b38
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/27d98b38
Branch: refs/heads/master
Commit: 27d98b384f2c0165fd53dd5ed1a500ce0f200255
Parents: fc58812
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Wed Feb 19 13:11:31 2014 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Wed Feb 19 13:33:08 2014 +0000
----------------------------------------------------------------------
.../quickstart_wicket_restful_jdo/pom.xml | 31 --------------
.../webapp/pom.xml | 21 ----------
.../simple_wicket_restful_jdo/pom.xml | 44 --------------------
3 files changed, 96 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/27d98b38/example/application/quickstart_wicket_restful_jdo/pom.xml
----------------------------------------------------------------------
diff --git a/example/application/quickstart_wicket_restful_jdo/pom.xml b/example/application/quickstart_wicket_restful_jdo/pom.xml
index ce5c82b..4daa3f0 100644
--- a/example/application/quickstart_wicket_restful_jdo/pom.xml
+++ b/example/application/quickstart_wicket_restful_jdo/pom.xml
@@ -382,37 +382,6 @@
<version>${quartz-scheduler.version}</version>
</dependency>
- <!-- 3rd party extensions -->
-
- <!--
- WICKEDCHARTS: uncomment to use https://github.com/danhaywood/isis-wicket-wickedcharts
- <dependency>
- <groupId>com.danhaywood.isis.wicket</groupId>
- <artifactId>danhaywood-isis-wicket-wickedcharts</artifactId>
- <version>1.2.0</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- -->
-
- <!--
- EXCEL: uncomment to use https://github.com/danhaywood/isis-wicket-excel
- <dependency>
- <groupId>com.danhaywood.isis.wicket</groupId>
- <artifactId>danhaywood-isis-wicket-excel</artifactId>
- <version>1.2.0</version>
- </dependency>
- -->
-
- <!--
- FULLCALENDAR: uncomment to use https://github.com/danhaywood/isis-wicket-fullcalendar
- <dependency>
- <groupId>com.danhaywood.isis.wicket</groupId>
- <artifactId>danhaywood-isis-wicket-fullcalendar</artifactId>
- <version>1.2.0</version>
- </dependency>
- -->
-
</dependencies>
</dependencyManagement>
http://git-wip-us.apache.org/repos/asf/isis/blob/27d98b38/example/application/quickstart_wicket_restful_jdo/webapp/pom.xml
----------------------------------------------------------------------
diff --git a/example/application/quickstart_wicket_restful_jdo/webapp/pom.xml b/example/application/quickstart_wicket_restful_jdo/webapp/pom.xml
index f4330f1..4df8c2e 100644
--- a/example/application/quickstart_wicket_restful_jdo/webapp/pom.xml
+++ b/example/application/quickstart_wicket_restful_jdo/webapp/pom.xml
@@ -267,7 +267,6 @@
<!-- quartz scheduler integration -->
-
<dependency>
<groupId>org.quartz-scheduler</groupId>
<artifactId>quartz</artifactId>
@@ -277,26 +276,6 @@
<artifactId>quartz-jobs</artifactId>
</dependency>
- <!-- 3rd party dependency -->
- <!--
- WICKEDCHARTS: uncomment to use https://github.com/danhaywood/isis-wicket-wickedcharts
- <dependency>
- <groupId>com.danhaywood.isis.wicket</groupId>
- <artifactId>danhaywood-isis-wicket-wickedcharts-scalarchart</artifactId>
- </dependency>
- <dependency>
- <groupId>com.danhaywood.isis.wicket</groupId>
- <artifactId>danhaywood-isis-wicket-wickedcharts-summarycharts</artifactId>
- </dependency>
- -->
- <!--
- EXCEL: uncomment to use https://github.com/danhaywood/isis-wicket-excel
- <dependency>
- <groupId>com.danhaywood.isis.wicket</groupId>
- <artifactId>danhaywood-isis-wicket-excel</artifactId>
- </dependency>
- -->
-
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/isis/blob/27d98b38/example/application/simple_wicket_restful_jdo/pom.xml
----------------------------------------------------------------------
diff --git a/example/application/simple_wicket_restful_jdo/pom.xml b/example/application/simple_wicket_restful_jdo/pom.xml
index 81bc9ef..9bf7db6 100644
--- a/example/application/simple_wicket_restful_jdo/pom.xml
+++ b/example/application/simple_wicket_restful_jdo/pom.xml
@@ -364,50 +364,6 @@
<artifactId>simple_wicket_restful_jdo-webapp</artifactId>
<version>${project.version}</version>
</dependency>
-
-
- <!-- 3rd party extensions -->
-
- <!--
- GMAP3: uncomment to use https://github.com/danhaywood/isis-wicket-gmap3
- <dependency>
- <groupId>com.danhaywood.isis.wicket</groupId>
- <artifactId>danhaywood-isis-wicket-gmap3</artifactId>
- <version>1.2.0</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- -->
-
- <!--
- WICKEDCHARTS: uncomment to use https://github.com/danhaywood/isis-wicket-wickedcharts
- <dependency>
- <groupId>com.danhaywood.isis.wicket</groupId>
- <artifactId>danhaywood-isis-wicket-wickedcharts</artifactId>
- <version>1.2.0</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- -->
-
- <!--
- EXCEL: uncomment to use https://github.com/danhaywood/isis-wicket-excel
- <dependency>
- <groupId>com.danhaywood.isis.wicket</groupId>
- <artifactId>danhaywood-isis-wicket-excel</artifactId>
- <version>1.2.0</version>
- </dependency>
- -->
-
- <!--
- FULLCALENDAR: uncomment to use https://github.com/danhaywood/isis-wicket-fullcalendar
- <dependency>
- <groupId>com.danhaywood.isis.wicket</groupId>
- <artifactId>danhaywood-isis-wicket-fullcalendar</artifactId>
- <version>1.2.0</version>
- </dependency>
- -->
-
</dependencies>
</dependencyManagement>
[4/5] git commit: ISIS-695: minor extension to Wicket viewer helper
class...
Posted by da...@apache.org.
ISIS-695: minor extension to Wicket viewer helper class...
... in order to support wickedchart extension (multiple series on same summarychart)
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/fc588124
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/fc588124
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/fc588124
Branch: refs/heads/master
Commit: fc58812499d18be0181196ac917b6d0393e4defc
Parents: 2f76f2e
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Wed Feb 19 13:10:24 2014 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Wed Feb 19 13:33:07 2014 +0000
----------------------------------------------------------------------
.../summary/CollectionContentsAsSummary.java | 15 ++++++++++++---
1 file changed, 12 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/fc588124/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/summary/CollectionContentsAsSummary.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/summary/CollectionContentsAsSummary.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/summary/CollectionContentsAsSummary.java
index c947633..4aee270 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/summary/CollectionContentsAsSummary.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/summary/CollectionContentsAsSummary.java
@@ -97,7 +97,7 @@ public class CollectionContentsAsSummary extends PanelAbstract<EntityCollectionM
List<ObjectAdapter> adapters = model.getObject();
- Summary summary = new Summary(adapters, numberAssociation);
+ Summary summary = new Summary(propertyName, adapters, numberAssociation);
addItem(item, ID_SUM, summary.getTotal());
addItem(item, ID_AVG, summary.getAverage());
addItem(item, ID_MIN, summary.getMin());
@@ -113,8 +113,14 @@ public class CollectionContentsAsSummary extends PanelAbstract<EntityCollectionM
private final List<String> titles = Lists.newArrayList();
private final List<BigDecimal> values = Lists.newArrayList();
private BigDecimal average;
+ private String propertyName;
public Summary(List<ObjectAdapter> adapters, ObjectAssociation numberAssociation) {
+ this(null, adapters, numberAssociation);
+ }
+
+ public Summary(String propertyName, List<ObjectAdapter> adapters, ObjectAssociation numberAssociation) {
+ this.propertyName = propertyName;
int nonNullCount = 0;
for (ObjectAdapter objectAdapter : adapters) {
titles.add(objectAdapter.titleString(null));
@@ -139,6 +145,9 @@ public class CollectionContentsAsSummary extends PanelAbstract<EntityCollectionM
average = nonNullCount != 0 ? sum.divide(BigDecimal.valueOf(nonNullCount), 2, RoundingMode.HALF_UP) : null;
}
+ public String getPropertyName() {
+ return propertyName;
+ }
public BigDecimal getTotal() {
return sum;
}
@@ -147,13 +156,13 @@ public class CollectionContentsAsSummary extends PanelAbstract<EntityCollectionM
}
public BigDecimal getMax() {
return max;
- }public BigDecimal getMin() {
+ }
+ public BigDecimal getMin() {
return min;
}
public List<String> getTitles() {
return Collections.unmodifiableList(titles);
}
-
public List<BigDecimal> getValues() {
return Collections.unmodifiableList(values);
}
[3/5] git commit: ISIS-699: backing out change.
Posted by da...@apache.org.
ISIS-699: backing out change.
... since the redirect doesn't always occur (not completely sure why).
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/2f76f2eb
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/2f76f2eb
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/2f76f2eb
Branch: refs/heads/master
Commit: 2f76f2ebd6b336d19a8c61d189552d0bc6256298
Parents: 3d36f49
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Wed Feb 19 13:05:00 2014 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Wed Feb 19 13:33:05 2014 +0000
----------------------------------------------------------------------
.../ActionResultResponseType.java | 5 ++++-
.../entity/properties/EntityPropertiesForm.java | 7 ++++---
.../wicket/ui/pages/entity/EntityPage.java | 22 ++++++++++++++------
3 files changed, 24 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/2f76f2eb/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/actionresponse/ActionResultResponseType.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/actionresponse/ActionResultResponseType.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/actionresponse/ActionResultResponseType.java
index 8f8b2a7..9e5b5af 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/actionresponse/ActionResultResponseType.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/actionresponse/ActionResultResponseType.java
@@ -67,7 +67,10 @@ public enum ActionResultResponseType {
}
private ActionResultResponse toEntityPage(final ActionModel model, final ObjectAdapter actualAdapter, ConcurrencyException exIfAny) {
- return ActionResultResponse.toPage(this, new EntityPage(actualAdapter, exIfAny));
+ // this will not preserve the URL (because pageParameters are not copied over)
+ // but trying to preserve them seems to cause the 302 redirect to be swallowed somehow
+ final EntityPage entityPage = new EntityPage(actualAdapter, exIfAny);
+ return ActionResultResponse.toPage(this, entityPage);
}
},
http://git-wip-us.apache.org/repos/asf/isis/blob/2f76f2eb/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/properties/EntityPropertiesForm.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/properties/EntityPropertiesForm.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/properties/EntityPropertiesForm.java
index d13dc50..b56599d 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/properties/EntityPropertiesForm.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/properties/EntityPropertiesForm.java
@@ -23,6 +23,7 @@ import java.util.Map;
import org.apache.wicket.Component;
import org.apache.wicket.MarkupContainer;
+import org.apache.wicket.Page;
import org.apache.wicket.RestartResponseException;
import org.apache.wicket.Session;
import org.apache.wicket.ajax.AjaxRequestTarget;
@@ -350,7 +351,7 @@ public class EntityPropertiesForm extends FormAbstract<ObjectAdapter> {
feedbackOrNotifyAnyRecognizedError(preValidationErrorIfAny, form);
// skip validation, because would relate to old values
- final EntityPage entityPage = new EntityPage(EntityPropertiesForm.this.getModelObject(), null);
+ final EntityPage entityPage = new EntityPage(EntityPropertiesForm.this.getModelObject(), null, new PageParameters());
EntityPropertiesForm.this.setResponsePage(entityPage);
} else {
// run Wicket's validation
@@ -404,9 +405,9 @@ public class EntityPropertiesForm extends FormAbstract<ObjectAdapter> {
toViewMode(null);
- final EntityPage entityPage = new EntityPage(EntityPropertiesForm.this.getModelObject(), null);
-
// "redirect-after-post"
+ // (url is not preserved, but can't figure out way to do so and combine with redirect that completes)
+ final EntityPage entityPage = new EntityPage(EntityPropertiesForm.this.getModelObject());
EntityPropertiesForm.this.setResponsePage(entityPage);
}
http://git-wip-us.apache.org/repos/asf/isis/blob/2f76f2eb/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/entity/EntityPage.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/entity/EntityPage.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/entity/EntityPage.java
index a0dfc95..d960e0a 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/entity/EntityPage.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/entity/EntityPage.java
@@ -51,11 +51,11 @@ public class EntityPage extends PageAbstract {
* {@link BookmarkablePageLink bookmarkable} links.
*/
public EntityPage(final PageParameters pageParameters) {
- this(pageParameters, new EntityModel(pageParameters));
+ this(new EntityModel(pageParameters), pageParameters);
}
- private EntityPage(final PageParameters pageParameters, final EntityModel entityModel) {
- this(pageParameters, entityModel, entityModel.getObject().titleString(null));
+ private EntityPage(final EntityModel entityModel, final PageParameters pageParameters) {
+ this(entityModel, pageParameters, entityModel.getObject().titleString(null));
}
public EntityPage(final ObjectAdapter adapter) {
@@ -70,8 +70,18 @@ public class EntityPage extends PageAbstract {
this(newEntityModel(adapter, exIfAny));
}
+ public EntityPage(ObjectAdapter adapter, ConcurrencyException exIfAny, PageParameters pageParameters) {
+ this(newEntityModel(adapter, exIfAny), pageParameters);
+ }
+
private EntityPage(EntityModel entityModel) {
- this(entityModel.getPageParameters(), entityModel);
+ // using the pageParameters implied by the entityModel means that the URL is preserved on redirect-after-post
+ // however... the redirect seems to be swallowed in some cases, meaning that the page is not re-rendered at all
+ // therefore, reverting this change.
+ //this(entityModel, entityModel.getPageParameters());
+
+ // using new PageParameters means that the page's URL will not be mounted, however it will at least re-render
+ this(entityModel, new PageParameters());
}
private static EntityModel newEntityModel(ObjectAdapter adapter, ConcurrencyException exIfAny) {
@@ -80,8 +90,8 @@ public class EntityPage extends PageAbstract {
return model;
}
- private EntityPage(PageParameters pageParameters, EntityModel entityModel, String titleString) {
- super(pageParameters, ApplicationActions.INCLUDE, titleString, ComponentType.ENTITY);
+ private EntityPage(EntityModel entityModel, PageParameters pageParameters, String titleString) {
+ super(pageParameters != null? pageParameters: entityModel.getPageParameters(), ApplicationActions.INCLUDE, titleString, ComponentType.ENTITY);
// this is a work-around for JRebel integration...
// ... even though the IsisJRebelPlugin calls invalidateCache, it seems that there is