Commit 2f76ea9d by Tuukka Kivilahti

Merge branch 'vip-multiadd' into 'master'

Vip multiadd fixes

Init vip multiadd page with current user
Also init new vip line with the host from the previous vip.

See merge request !356
2 parents 3747c7f2 536e1d59
......@@ -16,6 +16,7 @@ import fi.codecrew.moya.beans.ProductBeanLocal;
import fi.codecrew.moya.beans.UserBeanLocal;
import fi.codecrew.moya.beans.VipBeanLocal;
import fi.codecrew.moya.enums.apps.VipPermission;
import fi.codecrew.moya.model.EventUser;
import fi.codecrew.moya.model.Product;
import fi.codecrew.moya.model.Vip;
import fi.codecrew.moya.model.VipProduct;
......@@ -75,7 +76,9 @@ public class VipMultiadd extends GenericCDIView {
public void initMultiadd() {
if (super.requirePermissions(VipPermission.EDIT) && vipList == null) {
setVip(new Vip());
vip = new Vip();
vip.setHost(permbean.getCurrentUser());
vipList = new ArrayList<>();
vips = new ListDataModel<>(vipList);
productList = new ArrayList<>();
......@@ -101,7 +104,10 @@ public class VipMultiadd extends GenericCDIView {
public String addEntry() {
logger.info("added entry");
vipList.add(getVip());
setVip(new Vip());
EventUser oldHost = vip.getHost();
vip = new Vip();
vip.setHost(oldHost);
return null;
}
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!