Skip to content

Max Mecklin / Moya

Go to a project
Commit 394bb408 by Tuomas Riihimäki Committed by Juho Juopperi
Options

Mostly layout and i18n changes

1 parent c22dd581
Inline Side-by-side
Showing with 63 additions and 32 deletions
code/LanBortalBeans/ejbModule/fi/insomnia/bortal/beans/ProductBean.java
...@@ -13,7 +13,6 @@ import javax.ejb.Stateless; ...@@ -13,7 +13,6 @@ import javax.ejb.Stateless;
import fi.insomnia.bortal.enums.apps.ShopPermission; import fi.insomnia.bortal.enums.apps.ShopPermission;
import fi.insomnia.bortal.facade.AccountEventFacade; import fi.insomnia.bortal.facade.AccountEventFacade;
import fi.insomnia.bortal.facade.DiscountFacade; import fi.insomnia.bortal.facade.DiscountFacade;
import fi.insomnia.bortal.facade.DiscountInstanceFacade;
import fi.insomnia.bortal.facade.ProductFacade; import fi.insomnia.bortal.facade.ProductFacade;
import fi.insomnia.bortal.facade.UserFacade; import fi.insomnia.bortal.facade.UserFacade;
import fi.insomnia.bortal.model.AccountEvent; import fi.insomnia.bortal.model.AccountEvent;
...@@ -47,8 +46,6 @@ public class ProductBean implements ProductBeanLocal { ...@@ -47,8 +46,6 @@ public class ProductBean implements ProductBeanLocal {
@EJB @EJB
private AccountEventFacade accounteventfacade; private AccountEventFacade accounteventfacade;
@EJB @EJB
private DiscountInstanceFacade discountinstancefacade;
@EJB
private DiscountFacade discountfacade; private DiscountFacade discountfacade;
@EJB @EJB
private UserFacade userFacade; private UserFacade userFacade;
......
code/LanBortalBeans/ejbModule/fi/insomnia/bortal/beans/UserBean.java
...@@ -84,12 +84,10 @@ public class UserBean implements UserBeanLocal { ...@@ -84,12 +84,10 @@ public class UserBean implements UserBeanLocal {
private CardTemplateBeanLocal ctbean; private CardTemplateBeanLocal ctbean;
@EJB @EJB
private AccountEventBeanLocal acbean; private AccountEventBeanLocal acbean;
@EJB
private GroupMembershipFacade groupMembershipFacade;
@EJB @EJB
private PermissionBeanLocal permbean; private PermissionBeanLocal permbean;
@EJB
private GroupMembershipFacade gmfacade; private GroupMembershipFacade gmfacade;
@EJB @EJB
...@@ -152,9 +150,11 @@ public class UserBean implements UserBeanLocal { ...@@ -152,9 +150,11 @@ public class UserBean implements UserBeanLocal {
// add roles from accountEvents of the user // add roles from accountEvents of the user
addRecursive(checkedRoles, acbean.getRolesFromAccountEvents(u)); addRecursive(checkedRoles, acbean.getRolesFromAccountEvents(u));
for (GroupMembership member : groupMembershipFacade.findMemberships(u)) { for (GroupMembership member : gmfacade.findMemberships(u)) {
addRecursive(checkedRoles, member.getPlaceReservation().getProvidesRole()); if (member != null && member.getPlaceReservation() != null)
{
addRecursive(checkedRoles, member.getPlaceReservation().getProvidesRole());
}
} }
} }
} }
......
code/LanBortalBeans/ejbModule/fi/insomnia/bortal/facade/ProductFacade.java
...@@ -32,6 +32,7 @@ public class ProductFacade extends IntegerPkGenericFacade<Product> { ...@@ -32,6 +32,7 @@ public class ProductFacade extends IntegerPkGenericFacade<Product> {
CriteriaQuery<Product> cq = cb.createQuery(Product.class); CriteriaQuery<Product> cq = cb.createQuery(Product.class);
Root<Product> root = cq.from(Product.class); Root<Product> root = cq.from(Product.class);
cq.where(cb.equal(root.get(Product_.event), eventbean.getCurrentEvent())); cq.where(cb.equal(root.get(Product_.event), eventbean.getCurrentEvent()));
cq.orderBy(cb.asc(root.get(Product_.sort)));
return getEm().createQuery(cq).getResultList(); return getEm().createQuery(cq).getResultList();
} }
...@@ -58,8 +59,8 @@ public class ProductFacade extends IntegerPkGenericFacade<Product> { ...@@ -58,8 +59,8 @@ public class ProductFacade extends IntegerPkGenericFacade<Product> {
cq.where(cb.equal(root.get(Product_.event), eventbean.getCurrentEvent()), cq.where(cb.equal(root.get(Product_.event), eventbean.getCurrentEvent()),
cb.isTrue(root.get(Product_.prepaid))); cb.isTrue(root.get(Product_.prepaid)));
cq.orderBy(cb.asc(root.get(Product_.sort)));
return getEm().createQuery(cq).getResultList(); return getEm().createQuery(cq).getResultList();
} }
} }
code/LanBortalDatabase/src/fi/insomnia/bortal/model/LanEventPropertyKey.java
...@@ -2,10 +2,10 @@ package fi.insomnia.bortal.model; ...@@ -2,10 +2,10 @@ package fi.insomnia.bortal.model;
public enum LanEventPropertyKey { public enum LanEventPropertyKey {
EVENT_LOGO(Type.DATA, null), EVENT_LOGO(Type.DATA, null),
INVITEMAIL_SUBJECT(Type.TEXT, "Invite from Eventportal"), INVITEMAIL_SUBJECT(Type.TEXT, "Invitation to Stream demoparty"),
INVITEMAIL_CONTENT(Type.TEXT, "You have been invited to a Event by {1}. You can register to event intranet at {0}"), INVITEMAIL_CONTENT(Type.TEXT, "You have been invited to Stream demoparty by {1}.\n\nYou can register to stream demparty intranet at: {0}\n\nAfter registering to the intranet you can buy a ticket to Stream demoparty reduced price and invite your friends to join the party with you. More information can be found in the intranet. Remember also to visit our website at http://www.streamparty.org and join us at #streamparty in IRCNet. If you have any questions about this mail, registering to intranet, or anything else regarding Stream demoparty, please send us email to info@streamparty.org\n\n-- \nStream organizing\ninfo@streamparty.org"),
PORTAL_EMAIL_ADDRESS(Type.TEXT, "portal@tuhto.fi"), PORTAL_EMAIL_ADDRESS(Type.TEXT, "intra@streamparty.org"),
PORTAL_EMAIL_NAME(Type.TEXT, "Event portal"), ; PORTAL_EMAIL_NAME(Type.TEXT, "Streamparty intranet"), ;
private enum Type { private enum Type {
TEXT, DATE, DATA TEXT, DATE, DATA
......
code/LanBortalWeb/WebContent/user/acceptInvite.xhtml
...@@ -9,10 +9,13 @@ ...@@ -9,10 +9,13 @@
<f:event type="preRenderView" listener="#{inviteAcceptView.initView}" /> <f:event type="preRenderView" listener="#{inviteAcceptView.initView}" />
<f:viewParam name="token" value="#{inviteAcceptView.token}" /> <f:viewParam name="token" value="#{inviteAcceptView.token}" />
</f:metadata> </f:metadata>
<ui:define name="title">
<h1><h:outputText value="#{i18n['user.invite.header']}" /></h1>
</ui:define>
<ui:define name="content"> <ui:define name="content">
<ui:fragment rendered="#{!inviteAcceptView.done}">
<users:edit creating="true" commitaction="#{inviteAcceptView.createUser()}" commitvalue="#{i18n['user.create']}" /> <users:edit creating="true" commitaction="#{inviteAcceptView.createUser()}" commitvalue="#{i18n['user.create']}" />
</ui:fragment>
</ui:define> </ui:define>
</ui:composition> </ui:composition>
</h:body> </h:body>
......
code/LanBortalWeb/WebContent/user/create.xhtml
...@@ -10,7 +10,6 @@ ...@@ -10,7 +10,6 @@
<f:metadata> <f:metadata>
<f:event type="preRenderView" listener="#{userView.initCreateView}" /> <f:event type="preRenderView" listener="#{userView.initCreateView}" />
</f:metadata> </f:metadata>
<ui:param name="thispage" value="page.user.create" />
<ui:define name="content"> <ui:define name="content">
<users:edit creating="true" commitaction="#{userView.createUser()}" commitvalue="#{i18n['user.create']}" /> <users:edit creating="true" commitaction="#{userView.createUser()}" commitvalue="#{i18n['user.create']}" />
......
code/LanBortalWeb/src/fi/insomnia/bortal/resources/i18n_en.properties
...@@ -130,7 +130,9 @@ global.save = Save ...@@ -130,7 +130,9 @@ global.save = Save
imagefile.description = Description imagefile.description = Description
imagefile.file = Imagefile imagefile.file = Imagefile
invite.successfull = Invite sent successfully invite.notFound = Invite invalid or already used
invite.successfull = Invite sent successfully
invite.userCreateSuccessfull = User successfully created. You can now login.
javax.validation.constraints.AssertFalse.message = must be false javax.validation.constraints.AssertFalse.message = must be false
javax.validation.constraints.AssertTrue.message = must be true javax.validation.constraints.AssertTrue.message = must be true
...@@ -295,6 +297,7 @@ placegroupview.token = Placecode / user ...@@ -295,6 +297,7 @@ placegroupview.token = Placecode / user
placetoken.commit = Associate token placetoken.commit = Associate token
placetoken.pageHeader = Add token placetoken.pageHeader = Add token
placetoken.placelist = My places
placetoken.token = Token placetoken.token = Token
placetoken.tokenNotFound = Token not found! Check token placetoken.tokenNotFound = Token not found! Check token
placetoken.topText = You can associate a ticket bought by someone else to your account by inserting a token to the field below placetoken.topText = You can associate a ticket bought by someone else to your account by inserting a token to the field below
...@@ -401,6 +404,8 @@ sitepage.roles = Visible for roles ...@@ -401,6 +404,8 @@ sitepage.roles = Visible for roles
sitepagelist.header = Site pages sitepagelist.header = Site pages
submenu.auth.login = Login
submenu.auth.logoutResponse = Logout successfull
submenu.auth.sendResetMail = Password reset submenu.auth.sendResetMail = Password reset
submenu.bill.billSummary = Bill summary submenu.bill.billSummary = Bill summary
submenu.bill.list = My bills submenu.bill.list = My bills
...@@ -470,6 +475,7 @@ user.imagelist = Saved images ...@@ -470,6 +475,7 @@ user.imagelist = Saved images
user.imagesubmit = Send image user.imagesubmit = Send image
user.insertToken = Insert token user.insertToken = Insert token
user.invite = Invite user.invite = Invite
user.invite.header = Accept invitation
user.invitemail = Email address user.invitemail = Email address
user.lastName = Lastname user.lastName = Lastname
user.login = Login user.login = Login
......
code/LanBortalWeb/src/fi/insomnia/bortal/resources/i18n_fi.properties
...@@ -138,7 +138,9 @@ imagefile.file = Kuvatiedosto ...@@ -138,7 +138,9 @@ imagefile.file = Kuvatiedosto
index.title = Etusivu index.title = Etusivu
invite.successfull = Kutsu l\u00E4hetetty invite.notFound = Kutsu virheellinen tai jo k\u00E4ytetty.
invite.successfull = Kutsu l\u00E4hetetty
invite.userCreateSuccessfull = K\u00E4ytt\u00E4j\u00E4tunnus luotu onnistuneesti. Voit nyt kirjautua sis\u00E4\u00E4n j\u00E4rjeselm\u00E4\u00E4n.
javax.validation.constraints.AssertFalse.message = must be false javax.validation.constraints.AssertFalse.message = must be false
javax.validation.constraints.AssertTrue.message = must be true javax.validation.constraints.AssertTrue.message = must be true
...@@ -392,6 +394,8 @@ sitepage.roles = N\u00E4ytet\u00E4\u00E4n rooleille ...@@ -392,6 +394,8 @@ sitepage.roles = N\u00E4ytet\u00E4\u00E4n rooleille
sitepagelist.header = Sivuston sis\u00E4ll\u00F6t sitepagelist.header = Sivuston sis\u00E4ll\u00F6t
submenu.auth.login = Kirjaudu
submenu.auth.logoutResponse = Uloskirjautuminen onnistui
submenu.auth.sendResetMail = Salasanan palautus submenu.auth.sendResetMail = Salasanan palautus
submenu.bill.billSummary = Laskujen yhteenveto submenu.bill.billSummary = Laskujen yhteenveto
submenu.bill.list = N\u00E4yt\u00E4 omat laskut submenu.bill.list = N\u00E4yt\u00E4 omat laskut
...@@ -462,6 +466,7 @@ user.imageUploaded = Kuva l\u00E4hetetty. ...@@ -462,6 +466,7 @@ user.imageUploaded = Kuva l\u00E4hetetty.
user.imagelist = Tallennetut kuvat user.imagelist = Tallennetut kuvat
user.imagesubmit = L\u00E4het\u00E4 kuva user.imagesubmit = L\u00E4het\u00E4 kuva
user.invite = Kutsu user.invite = Kutsu
user.invite.header = Luo k\u00E4ytt\u00E4j\u00E4 kutsusta
user.invitemail = S\u00E4hk\u00F6postiosoite user.invitemail = S\u00E4hk\u00F6postiosoite
user.lastName = Sukunimi user.lastName = Sukunimi
user.login = K\u00E4ytt\u00E4j\u00E4tunnus user.login = K\u00E4ytt\u00E4j\u00E4tunnus
......
code/LanBortalWeb/src/fi/insomnia/bortal/web/cdiview/shop/InviteAcceptView.java
...@@ -8,8 +8,8 @@ import javax.inject.Named; ...@@ -8,8 +8,8 @@ import javax.inject.Named;
import fi.insomnia.bortal.beans.UserBeanLocal; import fi.insomnia.bortal.beans.UserBeanLocal;
import fi.insomnia.bortal.model.GroupMembership; import fi.insomnia.bortal.model.GroupMembership;
import fi.insomnia.bortal.model.User; import fi.insomnia.bortal.model.User;
import fi.insomnia.bortal.web.annotations.SelectedUser;
import fi.insomnia.bortal.web.cdiview.GenericCDIView; import fi.insomnia.bortal.web.cdiview.GenericCDIView;
import fi.insomnia.bortal.web.cdiview.user.UserView;
@Named @Named
@ConversationScoped @ConversationScoped
...@@ -20,27 +20,41 @@ public class InviteAcceptView extends GenericCDIView { ...@@ -20,27 +20,41 @@ public class InviteAcceptView extends GenericCDIView {
private String token; private String token;
@Inject @Inject
@SelectedUser private UserView userview;
private User user; private User user;
private boolean done = false;
@EJB @EJB
private transient UserBeanLocal userbean; private transient UserBeanLocal userbean;
private GroupMembership membership;
public void initView() { public void initView() {
super.beginConversation();
} if (membership == null) {
membership = userbean.findToken(token);
}
public String createUser() { if (membership == null || membership.getInviteAccepted() != null) {
GroupMembership gm = userbean.findToken(token);
if (gm == null || gm.getInviteAccepted() != null) {
this.addFaceMessage("invite.notFound"); this.addFaceMessage("invite.notFound");
return null; done = true;
} else if (user == null) {
user = new User();
userview.setUser(user);
super.beginConversation();
} }
userbean.createFromToken(user, token); }
return "/user/edit"; public String createUser() {
user.resetPassword(userview.getPassword());
userbean.createFromToken(user, token);
super.addFaceMessage("invite.userCreateSuccessfull");
done = true;
user = null;
return null;
} }
public void setToken(String token) { public void setToken(String token) {
...@@ -58,4 +72,12 @@ public class InviteAcceptView extends GenericCDIView { ...@@ -58,4 +72,12 @@ public class InviteAcceptView extends GenericCDIView {
public User getUser() { public User getUser() {
return user; return user;
} }
public boolean isDone() {
return done;
}
public void setDone(boolean done) {
this.done = done;
}
} }
code/LanBortalWeb/src/fi/insomnia/bortal/web/cdiview/user/PasswordResetView.java
...@@ -59,8 +59,6 @@ public class PasswordResetView extends GenericCDIView { ...@@ -59,8 +59,6 @@ public class PasswordResetView extends GenericCDIView {
StringBuilder path = new StringBuilder(); StringBuilder path = new StringBuilder();
String servername = extcontext.getRequestServerName(); String servername = extcontext.getRequestServerName();
logger.info("Serverport secure: {}", extcontext.getRequestServerPort(), extcontext.isSecure());
if (extcontext.getRequestServerPort() != 80) { if (extcontext.getRequestServerPort() != 80) {
if (extcontext.getRequestServerPort() == 443) { if (extcontext.getRequestServerPort() == 443) {
path.append("https://").append(servername.replace(":443", "")); path.append("https://").append(servername.replace(":443", ""));
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!