From ce3f4bd24c330e0cace6a31567e1516dfaa66234 Mon Sep 17 00:00:00 2001
From: Christian Aistleitner <christian@quelltextlich.at>
Date: Sun, 24 Mar 2013 20:42:23 -0400
Subject: [PATCH] Fix NPE when getting user's fork without repository list caching (issue-182)
---
src/com/gitblit/client/RegistrantPermissionsTableModel.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/com/gitblit/client/RegistrantPermissionsTableModel.java b/src/com/gitblit/client/RegistrantPermissionsTableModel.java
index 9ed8db4..28d2534 100644
--- a/src/com/gitblit/client/RegistrantPermissionsTableModel.java
+++ b/src/com/gitblit/client/RegistrantPermissionsTableModel.java
@@ -91,7 +91,7 @@
if (columnIndex == Columns.Permission.ordinal()) {
return AccessPermission.class;
} else if (columnIndex == Columns.Type.ordinal()) {
- return Boolean.class;
+ return RegistrantAccessPermission.class;
}
return String.class;
}
@@ -104,7 +104,7 @@
// and therefore can not be directly manipulated unless the current
// object is the source of the regex (i.e. a user or team with explicit
// regex definition)
- return permissions.get(rowIndex).isEditable;
+ return permissions.get(rowIndex).mutable;
}
return false;
}
@@ -117,7 +117,7 @@
case Registrant:
return rp.registrant;
case Type:
- return rp.permissionType;
+ return rp;
case Permission:
return rp.permission;
}
--
Gitblit v1.9.1