You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by sm...@apache.org on 2022/04/08 20:42:57 UTC

[directory-fortress-commander] 02/05: group page not showing search button and search modal erroneously req'd protocol field set

This is an automated email from the ASF dual-hosted git repository.

smckinney pushed a commit to branch wicket9
in repository https://gitbox.apache.org/repos/asf/directory-fortress-commander.git

commit 8994db27f702d59ef6267685af9ff37e279176e2
Author: Shawn McKinney <sm...@symas.com>
AuthorDate: Fri Apr 8 13:45:14 2022 -0500

    group page not showing search button and search modal erroneously req'd protocol field set
---
 .../org/apache/directory/fortress/web/panel/GroupDetailPanel.java   | 2 +-
 .../org/apache/directory/fortress/web/panel/GroupListPanel.java     | 5 ++---
 src/main/resources/FortressWebDemoUsers.xml                         | 6 +++++-
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/main/java/org/apache/directory/fortress/web/panel/GroupDetailPanel.java b/src/main/java/org/apache/directory/fortress/web/panel/GroupDetailPanel.java
index 0fb5976..8ee7936 100644
--- a/src/main/java/org/apache/directory/fortress/web/panel/GroupDetailPanel.java
+++ b/src/main/java/org/apache/directory/fortress/web/panel/GroupDetailPanel.java
@@ -125,11 +125,11 @@ public class GroupDetailPanel extends FormComponentPanel
             add( name );
             name.setRequired( false );
             TextField protocol = new TextField( "protocol" );
+            protocol.setRequired( false );
             add( protocol );
             TextField description = new TextField( "description" );
             description.setRequired( false );
             add( description );
-            protocol.setRequired( true );
             memberPropsCB = new ComboBox<>( "memberProps", new PropertyModel<String>( this,
                 "memberPropsSelection" ), new ArrayList<String>() );
             memberPropsCB.setOutputMarkupId( true );
diff --git a/src/main/java/org/apache/directory/fortress/web/panel/GroupListPanel.java b/src/main/java/org/apache/directory/fortress/web/panel/GroupListPanel.java
index 3c03f15..42b8473 100644
--- a/src/main/java/org/apache/directory/fortress/web/panel/GroupListPanel.java
+++ b/src/main/java/org/apache/directory/fortress/web/panel/GroupListPanel.java
@@ -124,10 +124,8 @@ public class GroupListPanel extends FormComponentPanel
             /** Default serialVersionUID */
             private static final long serialVersionUID = 1L;
 
-
             @Override
             protected void onSubmit( AjaxRequestTarget target )
-            //protected void onSubmit( AjaxRequestTarget target, Form form )
             {
                 LOG.debug( ".search.onSubmit selected radio button: " + selectedRadioButton );
                 info( "Searching Group Objects..." );
@@ -346,7 +344,8 @@ public class GroupListPanel extends FormComponentPanel
             }
         } );
 
-        memberRb.add( new SecureIndicatingAjaxLink( "memberAssignLinkLbl", GlobalIds.REVIEW_MGR, "findUsers" )
+//        memberRb.add( new SecureIndicatingAjaxLink( "memberAssignLinkLbl", GlobalIds.REVIEW_MGR, "findUsers" )
+        memberRb.add( new SecureIndicatingAjaxLink( "memberAssignLinkLbl", GlobalIds.GROUP_MGR, "findUsers" )
         {
             /** Default serialVersionUID */
             private static final long serialVersionUID = 1L;
diff --git a/src/main/resources/FortressWebDemoUsers.xml b/src/main/resources/FortressWebDemoUsers.xml
index f66c57c..2db88a8 100644
--- a/src/main/resources/FortressWebDemoUsers.xml
+++ b/src/main/resources/FortressWebDemoUsers.xml
@@ -129,6 +129,10 @@
                 <permgrant objName="org.apache.directory.fortress.core.impl.ReviewMgrImpl" opName="findUsers" roleNm="fortress-web-audit-admin" admin="true"/>
                 <permgrant objName="org.apache.directory.fortress.core.impl.ReviewMgrImpl" opName="findPermissions" roleNm="fortress-web-audit-admin" admin="true"/>
 
+                <permgrant objName="org.apache.directory.fortress.core.impl.GroupMgrImpl" opName="read" roleNm="fortress-web-audit-admin" admin="true"/>
+                <permgrant objName="org.apache.directory.fortress.core.impl.GroupMgrImpl" opName="find" roleNm="fortress-web-audit-admin" admin="true"/>
+                <permgrant objName="org.apache.directory.fortress.core.impl.GroupMgrImpl" opName="findWithUsers" roleNm="fortress-web-audit-admin" admin="true"/>
+
                 <permgrant objName="org.apache.directory.fortress.core.impl.ReviewMgrImpl" opName="readUser" roleNm="fortress-web-user-admin" admin="true"/>
                 <permgrant objName="org.apache.directory.fortress.core.impl.ReviewMgrImpl" opName="findUsers" roleNm="fortress-web-user-admin" admin="true"/>
                 <permgrant objName="org.apache.directory.fortress.core.impl.ReviewMgrImpl" opName="assignedUsers" roleNm="fortress-web-user-admin" admin="true"/>
@@ -181,4 +185,4 @@
 
         </FortressAdmin>
     </target>
-</project>
\ No newline at end of file
+</project>