directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From smckin...@apache.org
Subject directory-fortress-commander git commit: FC-71 - add description field to permission page
Date Tue, 17 Feb 2015 23:30:32 GMT
Repository: directory-fortress-commander
Updated Branches:
  refs/heads/master ad9418312 -> fa0db42e3


FC-71 - add description field to permission page


Project: http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/commit/fa0db42e
Tree: http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/tree/fa0db42e
Diff: http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/diff/fa0db42e

Branch: refs/heads/master
Commit: fa0db42e335c610920a283ca84d14c481b9eb7da
Parents: ad94183
Author: Shawn McKinney <smckinney@apache.org>
Authored: Tue Feb 17 17:30:19 2015 -0600
Committer: Shawn McKinney <smckinney@apache.org>
Committed: Tue Feb 17 17:30:19 2015 -0600

----------------------------------------------------------------------
 .../directory/fortress/web/panel/PermDetailPanel.java |  2 ++
 .../directory/fortress/web/panel/PermListPanel.java   | 14 +++++++-------
 .../apache/directory/fortress/web/panel/NavPanel.html |  2 +-
 .../directory/fortress/web/panel/PermDetailPanel.html |  8 ++++++++
 4 files changed, 18 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/fa0db42e/src/main/java/org/apache/directory/fortress/web/panel/PermDetailPanel.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/web/panel/PermDetailPanel.java b/src/main/java/org/apache/directory/fortress/web/panel/PermDetailPanel.java
index bc77532..6c76829 100644
--- a/src/main/java/org/apache/directory/fortress/web/panel/PermDetailPanel.java
+++ b/src/main/java/org/apache/directory/fortress/web/panel/PermDetailPanel.java
@@ -380,6 +380,8 @@ public class PermDetailPanel extends FormComponentPanel
             opName.setRequired( false );
             TextField objId = new TextField( GlobalIds.OBJECT_ID );
             add( objId );
+            TextField description = new TextField( GlobalIds.DESCRIPTION );
+            add( description );
             Label internalId = new Label( "internalId" );
             add( internalId );
             rolesCB = new ComboBox<String>( "roles", new PropertyModel<String>(
this, ROLES_SELECTION ), roles );

http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/fa0db42e/src/main/java/org/apache/directory/fortress/web/panel/PermListPanel.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/web/panel/PermListPanel.java b/src/main/java/org/apache/directory/fortress/web/panel/PermListPanel.java
index 993fff6..257a648 100644
--- a/src/main/java/org/apache/directory/fortress/web/panel/PermListPanel.java
+++ b/src/main/java/org/apache/directory/fortress/web/panel/PermListPanel.java
@@ -91,12 +91,17 @@ public class PermListPanel extends FormComponentPanel
         List<IGridColumn<DefaultTreeModel, DefaultMutableTreeNode, String>> columns
=
             new ArrayList<IGridColumn<DefaultTreeModel, DefaultMutableTreeNode, String>>();
         PropertyColumn objName = new PropertyColumn( new Model( "Object Name" ), "userObject.ObjName"
);
-        objName.setInitialSize( 250 );
+        objName.setInitialSize( 350 );
         columns.add( objName );
         columns.add( new PropertyColumn( new Model( "Object Id" ), "userObject.ObjId" ) );
         columns.add( new PropertyColumn( new Model( "Operation Name" ), "userObject.OpName"
) );
-        String roleAssignLabel;
 
+        PropertyColumn description = new PropertyColumn( new Model( "Description" ),
+            "userObject.Description" );
+        description.setInitialSize( 300 );
+        columns.add( description );
+
+        String roleAssignLabel;
         if ( isAdmin )
         {
             roleAssignLabel = "Admin Role Assignments";
@@ -105,14 +110,9 @@ public class PermListPanel extends FormComponentPanel
         {
             roleAssignLabel = "RBAC Role Assignments";
         }
-
         PropertyColumn roles = new PropertyColumn( new Model( roleAssignLabel ), "userObject.Roles"
);
         roles.setInitialSize( 500 );
         columns.add( roles );
-        PropertyColumn abstractPermName = new PropertyColumn( new Model( "Abstract Perm Name"
),
-            "userObject.AbstractName" );
-        abstractPermName.setInitialSize( 300 );
-        columns.add( abstractPermName );
 
         List<Permission> perms = ( List<Permission> ) getDefaultModel().getObject();
         treeModel = createTreeModel( perms );

http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/fa0db42e/src/main/resources/org/apache/directory/fortress/web/panel/NavPanel.html
----------------------------------------------------------------------
diff --git a/src/main/resources/org/apache/directory/fortress/web/panel/NavPanel.html b/src/main/resources/org/apache/directory/fortress/web/panel/NavPanel.html
index d132456..219a6b1 100644
--- a/src/main/resources/org/apache/directory/fortress/web/panel/NavPanel.html
+++ b/src/main/resources/org/apache/directory/fortress/web/panel/NavPanel.html
@@ -26,7 +26,7 @@
     <form wicket:id="navButtons">
         <br/>
 
-        <h4>Navigation Panel</h4>
+        <h4>Nav Panel</h4>
         <table id="inputFormTable">
             <tr>
                 <td>

http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/fa0db42e/src/main/resources/org/apache/directory/fortress/web/panel/PermDetailPanel.html
----------------------------------------------------------------------
diff --git a/src/main/resources/org/apache/directory/fortress/web/panel/PermDetailPanel.html
b/src/main/resources/org/apache/directory/fortress/web/panel/PermDetailPanel.html
index b7c4b00..e64febb 100644
--- a/src/main/resources/org/apache/directory/fortress/web/panel/PermDetailPanel.html
+++ b/src/main/resources/org/apache/directory/fortress/web/panel/PermDetailPanel.html
@@ -68,6 +68,14 @@
                 </tr>
                 <tr>
                     <td>
+                        <label for="description">Description</label>
+                    </td>
+                    <td>
+                        <input type="text" wicket:id="description" id="description" class="formLarge"
style="width: 250px"/>
+                    </td>
+                </tr>
+                <tr>
+                    <td>
                         <label for="roles">Roles</label>
                     </td>
                     <td>


Mime
View raw message