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/06/28 09:58:38 UTC
isis git commit: ISIS-1633: updates docs for INLINE_AS_IF_EDIT
Repository: isis
Updated Branches:
refs/heads/master 0b358df4d -> de0b34f88
ISIS-1633: updates docs for INLINE_AS_IF_EDIT
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/de0b34f8
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/de0b34f8
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/de0b34f8
Branch: refs/heads/master
Commit: de0b34f883ae399e0a075e996a24cebe30407c98
Parents: 0b358df
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Wed Jun 28 10:56:53 2017 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Wed Jun 28 10:56:53 2017 +0100
----------------------------------------------------------------------
.../guides/rgant/_rgant-PropertyLayout_promptStyle.adoc | 2 +-
.../guides/ugvw/_ugvw_configuration-properties.adoc | 10 +++++++---
.../promptstyle/PromptStyleConfiguration_Test.java | 4 ++--
3 files changed, 10 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/de0b34f8/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-PropertyLayout_promptStyle.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-PropertyLayout_promptStyle.adoc b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-PropertyLayout_promptStyle.adoc
index 6e61798..d9ae9f8 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-PropertyLayout_promptStyle.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-PropertyLayout_promptStyle.adoc
@@ -23,7 +23,7 @@ public class Customer {
}
----
<1> prompt for the new value for the property using an inline panel
-Note that the value `INLINE_AS_EDIT` does not make sense for properties; if specified then it will be interpreted as just `INLINE`.
+Note that the value `INLINE_AS_IF_EDIT` does not make sense for properties; if specified then it will be interpreted as just `INLINE`.
Alternatively, the `promptStyle()` can be specified using xref:../ugvw/ugvw.adoc#_ugvw_layout_file-based[file-based layouts].
http://git-wip-us.apache.org/repos/asf/isis/blob/de0b34f8/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_configuration-properties.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_configuration-properties.adoc b/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_configuration-properties.adoc
index b7212bb..f320c0f 100644
--- a/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_configuration-properties.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_configuration-properties.adoc
@@ -152,12 +152,16 @@ This feature is primarily just to help track any memory leakage issues that migh
|`isis.viewer.wicket.` +
`promptStyle`
-|`dialog`,`inline` +
+|`dialog`,`inline`, +
+`inline_as_if_edit` +
(`inline`)
|(`1.15.0-SNAPSHOT`) whether the prompt for editing a domain object property or invoking an action (associated with a property) is shown inline within the property's form, or instead shown in a modal dialog box.
-Can be overridden on a property-by-property basis using xref:../rgant/rgant.adoc#_rgant-PropertyLayout_promptStyle[`@Property#promptStyle()`]) or xref:../rgant/rgant.adoc#_rgant-ActionLayout_promptStyle[`@Action#promptStyle()`]).
+For actions, `inline_as_if_edit` will suppress the action's button, and instead let the action be invoked as if editing the property.
+The net effect is that being able to "edit" complex properties with multiple parts (eg a date) using a multi-argument editor (this editor, in fact, being the action's argument panel).
-Note that `inline_as_edit` does not make sense for a configuration property default, and will instead be interpreted as `inline`.
+The property can be overridden on a property-by-property basis using xref:../rgant/rgant.adoc#_rgant-PropertyLayout_promptStyle[`@Property#promptStyle()`]) or xref:../rgant/rgant.adoc#_rgant-ActionLayout_promptStyle[`@Action#promptStyle()`]).
+
+Note that `inline_as_if_edit` does not make sense for a configuration property default, and will instead be interpreted as `inline`.
|`isis.viewer.wicket.` +
`redirectEvenIfSameObject`
http://git-wip-us.apache.org/repos/asf/isis/blob/de0b34f8/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/properties/promptstyle/PromptStyleConfiguration_Test.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/properties/promptstyle/PromptStyleConfiguration_Test.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/properties/promptstyle/PromptStyleConfiguration_Test.java
index 6848633..ef809e3 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/properties/promptstyle/PromptStyleConfiguration_Test.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/properties/promptstyle/PromptStyleConfiguration_Test.java
@@ -42,10 +42,10 @@ public class PromptStyleConfiguration_Test {
}
@Test
- public void when_inline_as_edit() throws Exception {
+ public void when_inline_as_if_edit() throws Exception {
context.checking(new Expectations() {{
oneOf(mockIsisConfiguration).getString("isis.viewer.wicket.promptStyle");
- will(returnValue("inline_as_edit"));
+ will(returnValue("inline_as_if_edit"));
}});
// then is converted to INLINE (doesn't make sense to have INLINE_AS_EDIT as a default)