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 2021/05/28 08:48:08 UTC
[isis] branch master updated (d7d8691 -> d3bb1d4)
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git.
from d7d8691 ISIS-2709: fixes permission seed data:
new 647a6ad ISIS-2483: removes unnecessary import, fixes javadoc is all or whitespace
new f65d7b5 ISIS-2483: cosmetic - change filterEffectiveMemberPermissoins name to just 'Filter'
new d3bb1d4 ISIS-2483: cosmetic: adds missing layout file for secman's ApplicationOrphanedPermissionManager
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:
.../hidden/method/HiddenObjectFacetViaMethod.java | 2 +-
.../core/metamodel/spec/feature/ObjectFeature.java | 2 +-
.../executor/MemberExecutorServiceDefault.java | 2 +-
...nOrphanedPermissionManager.layout.fallback.xml} | 37 +++++-----------------
...ationUser_filterEffectiveMemberPermissions.java | 1 +
.../IsisModuleExtSecmanIntegration.java | 1 -
.../facets/TenantedAuthorizationPostProcessor.java | 2 --
7 files changed, 12 insertions(+), 35 deletions(-)
copy extensions/security/secman/applib/src/main/java/org/apache/isis/extensions/secman/applib/{tenancy/dom/ApplicationTenancy.layout.fallback.xml => permission/app/ApplicationOrphanedPermissionManager.layout.fallback.xml} (59%)
[isis] 01/03: ISIS-2483: removes unnecessary import,
fixes javadoc is all or whitespace
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 647a6ad4e21261fe6cd674de4caeda6ec892b2bb
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Fri May 28 09:45:20 2021 +0100
ISIS-2483: removes unnecessary import, fixes javadoc is all or whitespace
---
.../facets/object/hidden/method/HiddenObjectFacetViaMethod.java | 2 +-
.../java/org/apache/isis/core/metamodel/spec/feature/ObjectFeature.java | 2 +-
.../core/runtimeservices/executor/MemberExecutorServiceDefault.java | 2 +-
.../extensions/secman/integration/IsisModuleExtSecmanIntegration.java | 1 -
.../secman/integration/facets/TenantedAuthorizationPostProcessor.java | 2 --
5 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/hidden/method/HiddenObjectFacetViaMethod.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/hidden/method/HiddenObjectFacetViaMethod.java
index 98eb12b..55b2951 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/hidden/method/HiddenObjectFacetViaMethod.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/hidden/method/HiddenObjectFacetViaMethod.java
@@ -51,7 +51,7 @@ extends HiddenObjectFacetAbstract {
return null;
}
final Boolean isHidden = (Boolean) ManagedObjects.InvokeUtil.invoke(method, target);
- return isHidden.booleanValue() ? "Hidden" : null;
+ return isHidden ? "Hidden" : null;
}
@Override
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectFeature.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectFeature.java
index 61e660d..2870e73 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectFeature.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectFeature.java
@@ -73,7 +73,7 @@ public interface ObjectFeature extends Specification {
* <li>for an {@link ObjectAction action}, will always return <tt>null</tt>.
* See instead {@link ObjectAction#getReturnType()} and
* {@link ObjectAction#getParameterTypes()}.
- * <li>for a {@link ObjectActionParameter action}, will return the type of
+ * <li>for an {@link ObjectActionParameter action parameter}, will return the type of
* the parameter}.
* </ul>
*/
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/executor/MemberExecutorServiceDefault.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/executor/MemberExecutorServiceDefault.java
index 99d0358..979023e 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/executor/MemberExecutorServiceDefault.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/executor/MemberExecutorServiceDefault.java
@@ -260,7 +260,7 @@ implements MemberExecutorService {
}
val entityState = ManagedObjects.EntityUtil.getEntityState(resultAdapter);
- if(entityState.isDetached()) {
+ if(entityState.isDetached()) {
// ensure that any still-to-be-persisted adapters get persisted to DB.
getTransactionService().flushTransaction();
}
diff --git a/extensions/security/secman/integration/src/main/java/org/apache/isis/extensions/secman/integration/IsisModuleExtSecmanIntegration.java b/extensions/security/secman/integration/src/main/java/org/apache/isis/extensions/secman/integration/IsisModuleExtSecmanIntegration.java
index f48b694..23eb2a8 100644
--- a/extensions/security/secman/integration/src/main/java/org/apache/isis/extensions/secman/integration/IsisModuleExtSecmanIntegration.java
+++ b/extensions/security/secman/integration/src/main/java/org/apache/isis/extensions/secman/integration/IsisModuleExtSecmanIntegration.java
@@ -24,7 +24,6 @@ import org.springframework.context.annotation.Import;
import org.apache.isis.extensions.secman.applib.IsisModuleExtSecmanApplib;
import org.apache.isis.extensions.secman.integration.authorizor.AuthorizorSecman;
import org.apache.isis.extensions.secman.integration.facets.TenantedAuthorizationPostProcessor;
-import org.apache.isis.extensions.secman.applib.seed.SeedSecurityModuleService;
import org.apache.isis.extensions.secman.integration.spiimpl.ImpersonateMenuAdvisorForSecman;
import org.apache.isis.extensions.secman.integration.spiimpl.TableColumnVisibilityServiceForSecman;
import org.apache.isis.extensions.secman.integration.userreg.UserRegistrationServiceForSecman;
diff --git a/extensions/security/secman/integration/src/main/java/org/apache/isis/extensions/secman/integration/facets/TenantedAuthorizationPostProcessor.java b/extensions/security/secman/integration/src/main/java/org/apache/isis/extensions/secman/integration/facets/TenantedAuthorizationPostProcessor.java
index f4b6fdf..993e1ae 100644
--- a/extensions/security/secman/integration/src/main/java/org/apache/isis/extensions/secman/integration/facets/TenantedAuthorizationPostProcessor.java
+++ b/extensions/security/secman/integration/src/main/java/org/apache/isis/extensions/secman/integration/facets/TenantedAuthorizationPostProcessor.java
@@ -26,7 +26,6 @@ import javax.inject.Provider;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Component;
-import org.apache.isis.applib.services.inject.ServiceInjector;
import org.apache.isis.applib.services.queryresultscache.QueryResultsCache;
import org.apache.isis.applib.services.registry.ServiceRegistry;
import org.apache.isis.applib.services.user.UserService;
@@ -107,7 +106,6 @@ public class TenantedAuthorizationPostProcessor
}
@Inject ServiceRegistry serviceRegistry;
- @Inject ServiceInjector serviceInjector;
@Inject UserService userService;
@Inject @Lazy ApplicationUserRepository userRepository;
@Inject Provider<QueryResultsCache> queryResultsCacheProvider;
[isis] 03/03: ISIS-2483: cosmetic: adds missing layout file for
secman's ApplicationOrphanedPermissionManager
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
commit d3bb1d4d9d3ec11708e864621216aadd06d86b5c
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Fri May 28 09:47:47 2021 +0100
ISIS-2483: cosmetic: adds missing layout file for secman's ApplicationOrphanedPermissionManager
---
...onOrphanedPermissionManager.layout.fallback.xml | 46 ++++++++++++++++++++++
1 file changed, 46 insertions(+)
diff --git a/extensions/security/secman/applib/src/main/java/org/apache/isis/extensions/secman/applib/permission/app/ApplicationOrphanedPermissionManager.layout.fallback.xml b/extensions/security/secman/applib/src/main/java/org/apache/isis/extensions/secman/applib/permission/app/ApplicationOrphanedPermissionManager.layout.fallback.xml
new file mode 100644
index 0000000..736e807
--- /dev/null
+++ b/extensions/security/secman/applib/src/main/java/org/apache/isis/extensions/secman/applib/permission/app/ApplicationOrphanedPermissionManager.layout.fallback.xml
@@ -0,0 +1,46 @@
+<?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/>
+ </bs3:col>
+ </bs3:row>
+ <bs3:row>
+ <bs3:col span="12">
+ <cpt:collection id="orphanedCollections"/>
+ </bs3:col>
+ </bs3:row>
+ <bs3:row>
+ <bs3:col span="12">
+ <bs3:tabGroup unreferencedCollections="true"/>
+ </bs3:col>
+ </bs3:row>
+ <bs3:row>
+ <bs3:col span="12">
+ <cpt:fieldSet name="Metadata" id="metadata"/>
+ <cpt:fieldSet name="Other" id="other" unreferencedProperties="true"/>
+ </bs3:col>
+ </bs3:row>
+</bs3:grid>
[isis] 02/03: ISIS-2483: cosmetic - change
filterEffectiveMemberPermissoins name to just 'Filter'
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
commit f65d7b5021210ea0e5ac6c9fa94f90805752270e
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Fri May 28 09:45:43 2021 +0100
ISIS-2483: cosmetic - change filterEffectiveMemberPermissoins name to just 'Filter'
---
.../mixins/perms/ApplicationUser_filterEffectiveMemberPermissions.java | 1 +
1 file changed, 1 insertion(+)
diff --git a/extensions/security/secman/applib/src/main/java/org/apache/isis/extensions/secman/applib/user/dom/mixins/perms/ApplicationUser_filterEffectiveMemberPermissions.java b/extensions/security/secman/applib/src/main/java/org/apache/isis/extensions/secman/applib/user/dom/mixins/perms/ApplicationUser_filterEffectiveMemberPermissions.java
index ae453c9..951ae7c 100644
--- a/extensions/security/secman/applib/src/main/java/org/apache/isis/extensions/secman/applib/user/dom/mixins/perms/ApplicationUser_filterEffectiveMemberPermissions.java
+++ b/extensions/security/secman/applib/src/main/java/org/apache/isis/extensions/secman/applib/user/dom/mixins/perms/ApplicationUser_filterEffectiveMemberPermissions.java
@@ -45,6 +45,7 @@ import lombok.RequiredArgsConstructor;
)
@ActionLayout(
associateWith = "effectiveMemberPermissions",
+ named = "Filter",
promptStyle = PromptStyle.DIALOG_MODAL,
sequence = "1"
)