Rollen-spezifische Module
This commit is contained in:
parent
8ef722048b
commit
875d642f26
Binary file not shown.
@ -2,7 +2,7 @@ package de.hsadmin.core.util;
|
|||||||
|
|
||||||
public class TextUtil {
|
public class TextUtil {
|
||||||
|
|
||||||
public static String replaceUmlauts(String umlautString) {
|
public static String replaceUmlautCharacters(String umlautString) {
|
||||||
StringBuffer buffer = new StringBuffer();
|
StringBuffer buffer = new StringBuffer();
|
||||||
for (char c : umlautString.toCharArray()) {
|
for (char c : umlautString.toCharArray()) {
|
||||||
if ( (c >= 'a' && c <= 'z') ||
|
if ( (c >= 'a' && c <= 'z') ||
|
||||||
|
@ -27,7 +27,7 @@ public class CustomerModuleImpl extends AbstractModuleImpl {
|
|||||||
}
|
}
|
||||||
GenericModuleImpl helperModule = new GenericModuleImpl(getTransaction());
|
GenericModuleImpl helperModule = new GenericModuleImpl(getTransaction());
|
||||||
UnixUser custAccount = new UnixUser();
|
UnixUser custAccount = new UnixUser();
|
||||||
custAccount.setComment(TextUtil.replaceUmlauts(custComment));
|
custAccount.setComment(TextUtil.replaceUmlautCharacters(custComment));
|
||||||
custAccount.setName(newCustomer.getName());
|
custAccount.setName(newCustomer.getName());
|
||||||
custAccount.setPassword(newCustomer.getPassword());
|
custAccount.setPassword(newCustomer.getPassword());
|
||||||
custAccount.setShell("/usr/bin/passwd");
|
custAccount.setShell("/usr/bin/passwd");
|
||||||
|
@ -11,6 +11,7 @@ import javax.persistence.Query;
|
|||||||
import de.hsadmin.core.model.AbstractEntity;
|
import de.hsadmin.core.model.AbstractEntity;
|
||||||
import de.hsadmin.core.model.AbstractModuleImpl;
|
import de.hsadmin.core.model.AbstractModuleImpl;
|
||||||
import de.hsadmin.core.model.HSAdminException;
|
import de.hsadmin.core.model.HSAdminException;
|
||||||
|
import de.hsadmin.core.util.TextUtil;
|
||||||
import de.hsadmin.mods.cust.Contact;
|
import de.hsadmin.mods.cust.Contact;
|
||||||
import de.hsadmin.mods.cust.Customer;
|
import de.hsadmin.mods.cust.Customer;
|
||||||
import de.hsadmin.mods.user.UnixUser;
|
import de.hsadmin.mods.user.UnixUser;
|
||||||
@ -83,7 +84,7 @@ public class PacModuleImpl extends AbstractModuleImpl {
|
|||||||
pac.setUnixUser(users);
|
pac.setUnixUser(users);
|
||||||
UnixUser admin = new UnixUser();
|
UnixUser admin = new UnixUser();
|
||||||
Contact contact = customer.getContractualContact();
|
Contact contact = customer.getContractualContact();
|
||||||
admin.setComment(contact.getFirstName() + " " + contact.getLastName());
|
admin.setComment(TextUtil.replaceUmlautCharacters(contact.getFirstName() + " " + contact.getLastName()));
|
||||||
admin.setHomedir("/home/pacs/" + pac.getName());
|
admin.setHomedir("/home/pacs/" + pac.getName());
|
||||||
admin.setName(pac.getName());
|
admin.setName(pac.getName());
|
||||||
admin.setShell("/bin/bash");
|
admin.setShell("/bin/bash");
|
||||||
|
@ -306,10 +306,9 @@ public class UnixUser extends AbstractEntity implements Serializable {
|
|||||||
String pacName = pac.getName();
|
String pacName = pac.getName();
|
||||||
if (!name.equals(pacName) && !name.startsWith(pacName + "-"))
|
if (!name.equals(pacName) && !name.startsWith(pacName + "-"))
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
if (super.isWriteAllowedFor(loginUser))
|
if (super.isWriteAllowedFor(loginUser))
|
||||||
return true;
|
return true;
|
||||||
return this == loginUser || loginUser.hasPacAdminRoleFor(getPac());
|
return this.getId() == loginUser.getId() || loginUser.hasPacAdminRoleFor(getPac());
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@ -4,6 +4,7 @@ import java.text.DateFormat;
|
|||||||
import java.text.SimpleDateFormat;
|
import java.text.SimpleDateFormat;
|
||||||
import java.util.Date;
|
import java.util.Date;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
import java.util.Set;
|
||||||
|
|
||||||
import de.hsadmin.core.model.AbstractEntity;
|
import de.hsadmin.core.model.AbstractEntity;
|
||||||
import de.hsadmin.mods.cust.Customer;
|
import de.hsadmin.mods.cust.Customer;
|
||||||
@ -11,6 +12,7 @@ import de.hsadmin.mods.pac.BasePac;
|
|||||||
import de.hsadmin.mods.pac.Hive;
|
import de.hsadmin.mods.pac.Hive;
|
||||||
import de.hsadmin.mods.pac.INetAddress;
|
import de.hsadmin.mods.pac.INetAddress;
|
||||||
import de.hsadmin.mods.pac.Pac;
|
import de.hsadmin.mods.pac.Pac;
|
||||||
|
import de.hsadmin.mods.pac.PacComponent;
|
||||||
|
|
||||||
public class PacRemote extends AbstractRemote {
|
public class PacRemote extends AbstractRemote {
|
||||||
|
|
||||||
@ -25,6 +27,22 @@ public class PacRemote extends AbstractRemote {
|
|||||||
resultMap.put("customer", pac.getCustomer().getName());
|
resultMap.put("customer", pac.getCustomer().getName());
|
||||||
resultMap.put("curinetaddr", pac.getCurINetAddr().getInetAddr());
|
resultMap.put("curinetaddr", pac.getCurINetAddr().getInetAddr());
|
||||||
resultMap.put("created", df.format(pac.getCreated()));
|
resultMap.put("created", df.format(pac.getCreated()));
|
||||||
|
resultMap.put("basepac", pac.getBasepac().getName());
|
||||||
|
Set<PacComponent> pacComponents = pac.getPacComponents();
|
||||||
|
StringBuffer bf = new StringBuffer();
|
||||||
|
boolean empty = true;
|
||||||
|
for (PacComponent comp : pacComponents) {
|
||||||
|
if (comp.getQuantity() > 0) {
|
||||||
|
if (!empty) {
|
||||||
|
bf.append("; ");
|
||||||
|
}
|
||||||
|
bf.append(comp.getBaseComponent().getFeature());
|
||||||
|
bf.append("=");
|
||||||
|
bf.append(comp.getQuantity());
|
||||||
|
empty = false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
resultMap.put("components", bf.toString());
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@ -69,7 +87,6 @@ public class PacRemote extends AbstractRemote {
|
|||||||
@Override
|
@Override
|
||||||
protected void regularizeKeys(Map<String, String> whereParams) {
|
protected void regularizeKeys(Map<String, String> whereParams) {
|
||||||
replaceKey(whereParams, "customer", "customer.name");
|
replaceKey(whereParams, "customer", "customer.name");
|
||||||
replaceKey(whereParams, "basepac", "customer.name");
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user