Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Changing prompt style for SecMan permissions to modal, adapting Appli… #490

Merged
merged 1 commit into from Apr 15, 2021
Merged

Changing prompt style for SecMan permissions to modal, adapting Appli… #490

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...c/main/java/org/apache/isis/extensions/commandlog/impl/jdo/CommandJdo.layout.fallback.xml
View file
Open in desktop
Expand Up @@ -45,7 +45,7 @@
</cpt:fieldSet>
</bs3:col>
<bs3:col span="0">
<cpt:fieldSet name="Hidden">
<cpt:fieldSet name="Hidden" id="hidden">
<cpt:property id="preValue" hidden="EVERYWHERE"/>
<cpt:property id="postValue" hidden="EVERYWHERE"/>
</cpt:fieldSet>
Expand Down
6 changes: 5 additions & 1 deletion .../java/org/apache/isis/extensions/secman/model/dom/role/ApplicationRole_addPermission.java
View file
Open in desktop
Expand Up @@ -27,6 +27,7 @@
import org.apache.isis.applib.annotation.Optionality;
import org.apache.isis.applib.annotation.Parameter;
import org.apache.isis.applib.annotation.ParameterLayout;
import org.apache.isis.applib.annotation.PromptStyle;
import org.apache.isis.applib.services.appfeat.ApplicationFeature;
import org.apache.isis.applib.services.appfeat.ApplicationFeatureRepository;
import org.apache.isis.extensions.secman.api.permission.ApplicationPermission;
Expand All @@ -44,7 +45,10 @@
@Action(
domainEvent = AddPermissionDomainEvent.class,
associateWith = "permissions")
@ActionLayout(named="Add", sequence = "0")
@ActionLayout(
named="Add",
sequence = "0",
promptStyle = PromptStyle.DIALOG_MODAL)
@RequiredArgsConstructor
public class ApplicationRole_addPermission {

Expand Down
6 changes: 5 additions & 1 deletion ...a/org/apache/isis/extensions/secman/model/dom/role/ApplicationRole_removePermissions.java
View file
Open in desktop
Expand Up @@ -26,6 +26,7 @@
import org.apache.isis.applib.annotation.Action;
import org.apache.isis.applib.annotation.ActionLayout;
import org.apache.isis.applib.annotation.MemberSupport;
import org.apache.isis.applib.annotation.PromptStyle;
import org.apache.isis.applib.services.message.MessageService;
import org.apache.isis.applib.services.repository.RepositoryService;
import org.apache.isis.commons.internal.base._NullSafe;
Expand All @@ -40,7 +41,10 @@
@Action(
domainEvent = RemovePermissionDomainEvent.class,
associateWith = "permissions")
@ActionLayout(named="Remove", sequence = "10")
@ActionLayout(
named="Remove",
sequence = "10",
promptStyle = PromptStyle.DIALOG_MODAL)
@RequiredArgsConstructor
public class ApplicationRole_removePermissions {

Expand Down
3 changes: 2 additions & 1 deletion ...a/org/apache/isis/extensions/secman/model/dom/user/ApplicationUser_filterPermissions.java
View file
Open in desktop
Expand Up @@ -32,6 +32,7 @@
import org.apache.isis.applib.annotation.Optionality;
import org.apache.isis.applib.annotation.Parameter;
import org.apache.isis.applib.annotation.ParameterLayout;
import org.apache.isis.applib.annotation.PromptStyle;
import org.apache.isis.applib.annotation.SemanticsOf;
import org.apache.isis.applib.services.appfeat.ApplicationFeature;
import org.apache.isis.applib.services.appfeat.ApplicationFeatureId;
Expand All @@ -47,7 +48,7 @@
@Action(
semantics = SemanticsOf.SAFE,
associateWith = "permissions")
@ActionLayout(sequence = "1")
@ActionLayout(sequence = "1", promptStyle = PromptStyle.DIALOG_MODAL)
@RequiredArgsConstructor
public class ApplicationUser_filterPermissions {

Expand Down
93 changes: 93 additions & 0 deletions ...n/java/org/apache/isis/extensions/secman/jdo/dom/user/ApplicationUser.layout.fallback.xml
View file
Open in desktop
@@ -0,0 +1,93 @@
<?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/links http://isis.apache.org/applib/layout/links/links.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:lnk="http://isis.apache.org/applib/layout/links" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<bs3:row>
<bs3:col span="12" unreferencedActions="true">
<cpt:domainObject/>
<cpt:action id="delete"/>
<cpt:action id="open"/>
</bs3:col>
</bs3:row>
<bs3:row>
<bs3:col span="4">
<cpt:fieldSet name="Id" id="id" unreferencedProperties="true">
<cpt:property id="name"/>
<cpt:property id="username"/>
<cpt:property id="encryptedPassword"/>
</cpt:fieldSet>
<cpt:fieldSet name="Status" id="status">
<cpt:property id="accountType"/>
<cpt:property id="hasPassword"/>
<cpt:property id="status"/>
<cpt:property id="atPath"/>
</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="8">
<bs3:row>
<bs3:col span="12">
<bs3:tabGroup>
<bs3:tab name="Name and Contact Details">
<bs3:row>
<bs3:col span="6">
<cpt:fieldSet name="Contact Details" id="contactDetails">
<cpt:property id="emailAddress"/>
<cpt:property id="phoneNumber"/>
<cpt:property id="faxNumber"/>
</cpt:fieldSet>
</bs3:col>
<bs3:col span="6">
<cpt:fieldSet name="Name" id="name">
<cpt:property id="familyName"/>
<cpt:property id="givenName"/>
<cpt:property id="knownAs"/>
</cpt:fieldSet>
</bs3:col>
</bs3:row>
</bs3:tab>
<bs3:tab name="Roles">
<bs3:row>
<bs3:col span="12">
<cpt:collection id="roles"/>
</bs3:col>
</bs3:row>
</bs3:tab>
<bs3:tab name="Permissions">
<bs3:row>
<bs3:col span="12">
<cpt:collection id="permissions"/>
</bs3:col>
</bs3:row>
</bs3:tab>
<bs3:tab name="Other">
<bs3:row>
<bs3:col span="12" unreferencedCollections="true" />
</bs3:row>
</bs3:tab>
</bs3:tabGroup>
</bs3:col>
</bs3:row>
</bs3:col>
</bs3:row>
</bs3:grid>
72 changes: 0 additions & 72 deletions ...o/src/main/java/org/apache/isis/extensions/secman/jdo/dom/user/ApplicationUser.layout.xml
View file
Open in desktop

This file was deleted.

93 changes: 93 additions & 0 deletions ...n/java/org/apache/isis/extensions/secman/jpa/dom/user/ApplicationUser.layout.fallback.xml
View file
Open in desktop
@@ -0,0 +1,93 @@
<?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/links http://isis.apache.org/applib/layout/links/links.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:lnk="http://isis.apache.org/applib/layout/links" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<bs3:row>
<bs3:col span="12" unreferencedActions="true">
<cpt:domainObject/>
<cpt:action id="delete"/>
<cpt:action id="open"/>
</bs3:col>
</bs3:row>
<bs3:row>
<bs3:col span="4">
<cpt:fieldSet name="Id" id="id" unreferencedProperties="true">
<cpt:property id="name"/>
<cpt:property id="username"/>
<cpt:property id="encryptedPassword"/>
</cpt:fieldSet>
<cpt:fieldSet name="Status" id="status">
<cpt:property id="accountType"/>
<cpt:property id="hasPassword"/>
<cpt:property id="status"/>
<cpt:property id="atPath"/>
</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="8">
<bs3:row>
<bs3:col span="12">
<bs3:tabGroup>
<bs3:tab name="Name and Contact Details">
<bs3:row>
<bs3:col span="6">
<cpt:fieldSet name="Contact Details" id="contactDetails">
<cpt:property id="emailAddress"/>
<cpt:property id="phoneNumber"/>
<cpt:property id="faxNumber"/>
</cpt:fieldSet>
</bs3:col>
<bs3:col span="6">
<cpt:fieldSet name="Name" id="name">
<cpt:property id="familyName"/>
<cpt:property id="givenName"/>
<cpt:property id="knownAs"/>
</cpt:fieldSet>
</bs3:col>
</bs3:row>
</bs3:tab>
<bs3:tab name="Roles">
<bs3:row>
<bs3:col span="12">
<cpt:collection id="roles"/>
</bs3:col>
</bs3:row>
</bs3:tab>
<bs3:tab name="Permissions">
<bs3:row>
<bs3:col span="12">
<cpt:collection id="permissions"/>
</bs3:col>
</bs3:row>
</bs3:tab>
<bs3:tab name="Other">
<bs3:row>
<bs3:col span="12" unreferencedCollections="true" />
</bs3:row>
</bs3:tab>
</bs3:tabGroup>
</bs3:col>
</bs3:row>
</bs3:col>
</bs3:row>
</bs3:grid>