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/04/14 16:41:02 UTC
[isis] branch master updated: ISIS-2561: fixes up invalid user code
(demo/secman) part 1
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 294e4d0 ISIS-2561: fixes up invalid user code (demo/secman) part 1
294e4d0 is described below
commit 294e4d0f34626dbae7ace432133e1828d10a1513
Author: Andi Huber <ah...@apache.org>
AuthorDate: Wed Apr 14 18:40:49 2021 +0200
ISIS-2561: fixes up invalid user code (demo/secman) part 1
---
.../dom/domain/actions/Action/semantics/ActionSemanticsVm.java | 6 +++---
.../secman/model/dom/feature/ApplicationFeatureViewModel.java | 2 +-
.../secman/model/dom/user/ApplicationUser_removeRoles.java | 1 -
.../secman/model/dom/user/ApplicationUser_updateAccountType.java | 4 ++--
4 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/semantics/ActionSemanticsVm.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/semantics/ActionSemanticsVm.java
index 0a0a246..bb71549 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/semantics/ActionSemanticsVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/semantics/ActionSemanticsVm.java
@@ -148,7 +148,7 @@ public class ActionSemanticsVm implements HasAsciiDocDescription {
setPropertyNoAnnotation(getPropertyNoAnnotation() + amount);
return this;
}
- public int default0IncrementNoAnnotation() {
+ public int default0IncrementByAmountNoAnnotation() {
return 1;
}
//end::action-no-annotation[]
@@ -318,7 +318,7 @@ public class ActionSemanticsVm implements HasAsciiDocDescription {
setPropertyForMetaAnnotations(value);
return this;
}
- public int default0UpdateMetaAnnotated() {
+ public int default0SetToValueMetaAnnotated() {
return getPropertyForMetaAnnotations();
}
//end::action-meta-annotated[]
@@ -340,7 +340,7 @@ public class ActionSemanticsVm implements HasAsciiDocDescription {
setPropertyForMetaAnnotationsOverridden(val);
return this;
}
- public int default0UpdateMetaAnnotatedOverridden() {
+ public int default0SetToValueMetaAnnotatedOverridden() {
return getPropertyForMetaAnnotationsOverridden();
}
//end::action-meta-annotated-overridden[]
diff --git a/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/feature/ApplicationFeatureViewModel.java b/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/feature/ApplicationFeatureViewModel.java
index b327a1f..955c8c1 100644
--- a/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/feature/ApplicationFeatureViewModel.java
+++ b/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/feature/ApplicationFeatureViewModel.java
@@ -206,7 +206,7 @@ public abstract class ApplicationFeatureViewModel implements ViewModel {
public String getTypeSimpleName() {
return getFeatureId().getTypeSimpleName();
}
- public boolean hideClassName() {
+ public boolean hideTypeSimpleName() {
return getSort().isNamespace();
}
diff --git a/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/user/ApplicationUser_removeRoles.java b/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/user/ApplicationUser_removeRoles.java
index 61da569..d009da1 100644
--- a/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/user/ApplicationUser_removeRoles.java
+++ b/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/user/ApplicationUser_removeRoles.java
@@ -59,7 +59,6 @@ public class ApplicationUser_removeRoles {
return target;
}
- @MemberSupport
// same logic in ApplicationRole_removeUsers
public boolean canRemove(
final ApplicationRole applicationRole) {
diff --git a/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/user/ApplicationUser_updateAccountType.java b/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/user/ApplicationUser_updateAccountType.java
index 83bea50..b6ff677 100644
--- a/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/user/ApplicationUser_updateAccountType.java
+++ b/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/user/ApplicationUser_updateAccountType.java
@@ -49,14 +49,14 @@ public class ApplicationUser_updateAccountType {
}
@MemberSupport
- public String disableUpdateAccountType() {
+ public String disableAct() {
return applicationUserRepository.isAdminUser(target)
? "Cannot change account type for admin user"
: null;
}
@MemberSupport
- public AccountType default0UpdateAccountType() {
+ public AccountType default0Act() {
return target.getAccountType();
}