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 2016/08/31 03:28:26 UTC
directory-fortress-commander git commit: remove nav control on
dataview & cleanup exception processing in model
Repository: directory-fortress-commander
Updated Branches:
refs/heads/master 323bcd8cd -> fb3985461
remove nav control on dataview & cleanup exception processing in model
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/fb398546
Tree: http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/tree/fb398546
Diff: http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/diff/fb398546
Branch: refs/heads/master
Commit: fb3985461c7d2cdef87f3bf5853688658755c84b
Parents: 323bcd8
Author: Shawn McKinney <sm...@apache.org>
Authored: Tue Aug 30 07:33:14 2016 -0500
Committer: Shawn McKinney <sm...@apache.org>
Committed: Tue Aug 30 07:33:14 2016 -0500
----------------------------------------------------------------------
.../directory/fortress/web/model/AuditModListModel.java | 12 +++++++-----
.../fortress/web/panel/AuditModDetailPanel.java | 2 --
.../fortress/web/panel/AuditModDetailPanel.html | 8 ++------
3 files changed, 9 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/fb398546/src/main/java/org/apache/directory/fortress/web/model/AuditModListModel.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/web/model/AuditModListModel.java b/src/main/java/org/apache/directory/fortress/web/model/AuditModListModel.java
index c19c7a7..ff42e0b 100644
--- a/src/main/java/org/apache/directory/fortress/web/model/AuditModListModel.java
+++ b/src/main/java/org/apache/directory/fortress/web/model/AuditModListModel.java
@@ -109,17 +109,17 @@ public class AuditModListModel extends Model<SerializableList<Mod>>
.getInternalUserId() ) )
{
User user = getUser( userAudit );
-
if ( user == null )
{
String warning = "Matching user not found for userId: " + userAudit.getUserId();
LOG.warn( warning );
- throw new RuntimeException( warning );
+ //throw new RuntimeException( warning );
+ }
+ else
+ {
+ userAudit.setInternalUserId( user.getInternalId() );
}
-
- userAudit.setInternalUserId( user.getInternalId() );
}
-
mods = new SerializableList<>( getList( userAudit ) );
}
@@ -162,6 +162,8 @@ public class AuditModListModel extends Model<SerializableList<Mod>>
{
String error = ".getList caught SecurityException=" + se;
LOG.warn(error);
+ // create empty model object to prevent npe in listview.
+ modList = new SerializableList<>( new ArrayList<Mod>() );
}
return modList;
http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/fb398546/src/main/java/org/apache/directory/fortress/web/panel/AuditModDetailPanel.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/web/panel/AuditModDetailPanel.java b/src/main/java/org/apache/directory/fortress/web/panel/AuditModDetailPanel.java
index f29e0ea..e88367c 100644
--- a/src/main/java/org/apache/directory/fortress/web/panel/AuditModDetailPanel.java
+++ b/src/main/java/org/apache/directory/fortress/web/panel/AuditModDetailPanel.java
@@ -148,9 +148,7 @@ public class AuditModDetailPanel extends FormComponentPanel
} ));
}
};
- view.setItemsPerPage( 5L );
addOrReplace( view );
- addOrReplace( new PagingNavigator( "navigator", view ) );
}
@Override
http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/fb398546/src/main/resources/org/apache/directory/fortress/web/panel/AuditModDetailPanel.html
----------------------------------------------------------------------
diff --git a/src/main/resources/org/apache/directory/fortress/web/panel/AuditModDetailPanel.html b/src/main/resources/org/apache/directory/fortress/web/panel/AuditModDetailPanel.html
index 6215956..4f265bd 100644
--- a/src/main/resources/org/apache/directory/fortress/web/panel/AuditModDetailPanel.html
+++ b/src/main/resources/org/apache/directory/fortress/web/panel/AuditModDetailPanel.html
@@ -74,15 +74,14 @@
</tr>
<tr>
<td>
- <label>Modifications</label>
+ <label>Mods</label>
</td>
<td>
- <span wicket:id="navigator">[dataview navigator]</span>
<table cellspacing="0" class="dataview">
<tr>
<th></th>
<th></th>
- <th>Type</th>
+ <th>Op</th>
<th></th>
<th>Name</th>
<th></th>
@@ -100,9 +99,6 @@
</table>
</td>
</tr>
- <tr>
- <td colspan="3"><hr/></td>
- </tr>
</table>
</fieldset>
</div>