hostsharing/hs.hsadmin
8
1
Fork 0
Code Pull Requests Activity

NullPointerException fuer Hostmaster im Queue-Modul

Browse Source
This commit is contained in:
Peter Hormanns 2011-06-24 12:05:41 +00:00
parent 73fbf80782
commit 85a7dd60bf
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
hsarback/src/de/hsadmin/core/qserv/QueueTask.java
View File

@ -74,8 +74,9 @@ public class QueueTask extends AbstractEntity implements Serializable {
*/
@Override
public boolean isReadAllowedFor(UnixUser loginUser) {
return loginUser.hasPacAdminRoleFor(getUser().getPac())
|| loginUser.id() == getUser().id();
return loginUser.hasHostmasterRole()
|| loginUser.hasPacAdminRoleFor(getUser().getPac())
|| loginUser.id() == getUser().id();
}
/**

6
hsarback/src/de/hsadmin/mods/user/UnixUser.java
View File

@ -287,9 +287,9 @@ public class UnixUser extends AbstractEntity implements Serializable {
* determines whether this user account has admin rights on the given pac
*/
public boolean hasPacAdminRoleFor(de.hsadmin.mods.pac.Pac pac) {
// TODO: hardcoded Hostsharing conventions
return pac.getName().equals(getName())
|| hasCustomerRoleFor(pac.getCustomer());
return pac != null &&
(pac.getName().equals(getName())
|| hasCustomerRoleFor(pac.getCustomer()) );
}
/**