You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2021/01/29 18:35:37 UTC
[isis] branch master updated: ISIS-2510: layout fixes
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/master by this push:
new c115d9c ISIS-2510: layout fixes
c115d9c is described below
commit c115d9c3cd8b7f9e103d33f518dde2b6d67fd3cb
Author: Andi Huber <ah...@apache.org>
AuthorDate: Fri Jan 29 19:35:18 2021 +0100
ISIS-2510: layout fixes
---
.../api/permission/ApplicationPermission.java | 34 +++++++++----
.../permission/ApplicationPermission.layout.xml | 56 ++++++++++++++++++++++
.../jdo/dom/permission/ApplicationPermission.java | 3 +-
.../jpa/dom/permission/ApplicationPermission.java | 1 -
4 files changed, 82 insertions(+), 12 deletions(-)
diff --git a/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/permission/ApplicationPermission.java b/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/permission/ApplicationPermission.java
index 0b510e9..a28d5c7 100644
--- a/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/permission/ApplicationPermission.java
+++ b/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/permission/ApplicationPermission.java
@@ -122,12 +122,19 @@ public interface ApplicationPermission {
ApplicationFeatureType getFeatureType();
+ // -- ROLE
+
@Property
- @MemberOrder(name="Feature", sequence = "5.1")
- default String getFeatureFqn() {
+ @PropertyLayout(
+ hidden=Where.REFERENCES_PARENT
+ )
+ @MemberOrder(name="Role", sequence = "1")
+ default ApplicationRole getRole() {
throw _Exceptions.unsupportedOperation("please implement me");
}
- void setFeatureFqn(String featureFqn);
+ void setRole(ApplicationRole applicationRole);
+
+ // -- RULE
@Property
@MemberOrder(name="Permissions", sequence = "2")
@@ -136,6 +143,8 @@ public interface ApplicationPermission {
}
void setRule(ApplicationPermissionRule rule);
+ // -- MODE
+
@Property
@MemberOrder(name="Permissions", sequence = "3")
default ApplicationPermissionMode getMode() {
@@ -143,15 +152,22 @@ public interface ApplicationPermission {
}
void setMode(ApplicationPermissionMode changing);
+ // -- TYPE
+
@Property
- @PropertyLayout(
- hidden=Where.REFERENCES_PARENT
- )
- @MemberOrder(name="Role", sequence = "1")
- default ApplicationRole getRole() {
+ @MemberOrder(name="Feature", sequence = "5")
+ default String getType() {
throw _Exceptions.unsupportedOperation("please implement me");
}
- void setRole(ApplicationRole applicationRole);
+
+ // -- FQN
+
+ @Property
+ @MemberOrder(name="Feature", sequence = "5.1")
+ default String getFeatureFqn() {
+ throw _Exceptions.unsupportedOperation("please implement me");
+ }
+ void setFeatureFqn(String featureFqn);
// -- HELPER
diff --git a/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/permission/ApplicationPermission.layout.xml b/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/permission/ApplicationPermission.layout.xml
new file mode 100644
index 0000000..edf5db3
--- /dev/null
+++ b/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/permission/ApplicationPermission.layout.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<bs3:grid
+ xsi:schemaLocation="http://isis.apache.org/applib/layout/component http://isis.apache.org/applib/layout/component/component.xsd http://isis.apache.org/applib/layout/grid/bootstrap3 http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
+ xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3"
+ xmlns:cpt="http://isis.apache.org/applib/layout/component"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <bs3:row>
+ <bs3:col span="12" unreferencedActions="true">
+ <cpt:domainObject/>
+ <cpt:action id="delete"/>
+ </bs3:col>
+ </bs3:row>
+ <bs3:row>
+ <bs3:col span="3">
+ <cpt:fieldSet name="Role" id="role" unreferencedProperties="true">
+ <cpt:property id="role"/>
+ </cpt:fieldSet>
+ <cpt:fieldSet name="Metadata" id="metadata">
+ <cpt:property id="datanucleusIdLong"/>
+ <cpt:property id="datanucleusVersionLong"/>
+ <cpt:property id="datanucleusVersionTimestamp"/>
+ </cpt:fieldSet>
+ </bs3:col>
+ <bs3:col span="3">
+ <cpt:fieldSet name="Permissions" id="permissions">
+ <cpt:property id="rule"/>
+ <cpt:property id="mode"/>
+ </cpt:fieldSet>
+ </bs3:col>
+ <bs3:col span="6">
+ <cpt:fieldSet name="Feature" id="feature">
+ <cpt:property id="type"/>
+ <cpt:property id="featureFqn"/>
+ </cpt:fieldSet>
+ </bs3:col>
+ <bs3:col span="12" unreferencedCollections="true"/>
+ </bs3:row>
+</bs3:grid>
diff --git a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/permission/ApplicationPermission.java b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/permission/ApplicationPermission.java
index cd71ac2..27bb346 100644
--- a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/permission/ApplicationPermission.java
+++ b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/permission/ApplicationPermission.java
@@ -180,11 +180,10 @@ public class ApplicationPermission implements org.apache.isis.extensions.secman.
editing = Editing.DISABLED
)
@PropertyLayout(typicalLength=ApplicationPermission.TYPICAL_LENGTH_TYPE)
- @MemberOrder(name="Feature", sequence = "5")
public String getType() {
final Enum<?> e = getFeatureType() != ApplicationFeatureType.MEMBER
? getFeatureType()
- : getMemberType().orElse(null);
+ : getMemberType().orElse(null);
return e != null ? e.name(): null;
}
diff --git a/extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/dom/permission/ApplicationPermission.java b/extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/dom/permission/ApplicationPermission.java
index 4e048d5..bc95dad 100644
--- a/extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/dom/permission/ApplicationPermission.java
+++ b/extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/dom/permission/ApplicationPermission.java
@@ -192,7 +192,6 @@ implements
editing = Editing.DISABLED
)
@PropertyLayout(typicalLength=ApplicationPermission.TYPICAL_LENGTH_TYPE)
- @MemberOrder(name="Feature", sequence = "5")
public String getType() {
final Enum<?> e = getFeatureType() != ApplicationFeatureType.MEMBER
? getFeatureType()