Merge branch 'master' of

ssh://hsh04-source@hsh04.hostsharing.net/home/doms/source.hostsharing.net/source/hsadmin.git
This commit is contained in:
Michael Hierweck 2013-04-30 21:16:07 +02:00
commit 953938a033

View File

@ -88,7 +88,7 @@ public class PacModuleImpl extends AbstractModuleImpl {
pac.setPacComponents(pacComponents); pac.setPacComponents(pacComponents);
AbstractEntity newPacEntity = null; AbstractEntity newPacEntity = null;
String pacType = pac.getBasepac().getName(); String pacType = pac.getBasepac().getName();
if (!pacType.equals(Pac.PAC_WEB) && !pacType.equals(Pac.PAC_DW) && !pacType.equals(Pac.PAC_SW)) { if (pacType.equals(Pac.PAC_WEB) || pacType.equals(Pac.PAC_DW) || pacType.equals(Pac.PAC_SW)) {
Set<UnixUser> users = new HashSet<UnixUser>(); Set<UnixUser> users = new HashSet<UnixUser>();
pac.setUnixUser(users); pac.setUnixUser(users);
UnixUser admin = new UnixUser(); UnixUser admin = new UnixUser();
@ -157,7 +157,7 @@ public class PacModuleImpl extends AbstractModuleImpl {
throw new AuthorisationException(getTransaction().getLoginUser(), "delete", existingEntity); throw new AuthorisationException(getTransaction().getLoginUser(), "delete", existingEntity);
} }
String pacType = pac.getBasepac().getName(); String pacType = pac.getBasepac().getName();
if (!pacType.equals(Pac.PAC_WEB) && !pacType.equals(Pac.PAC_DW) && !pacType.equals(Pac.PAC_SW)) { if (pacType.equals(Pac.PAC_WEB) || pacType.equals(Pac.PAC_DW) || pacType.equals(Pac.PAC_SW)) {
GenericModuleImpl helperModule = new GenericModuleImpl(getTransaction()); GenericModuleImpl helperModule = new GenericModuleImpl(getTransaction());
String[] dependQueries = new String[] { String[] dependQueries = new String[] {