Skip to content

Riina Antikainen / Moya

Go to a project
Commit b70320be by Tuukka Kivilahti
Options

Merge branch 'random-fixes2' into 'master' 

Random fixes2



See merge request !368
2 parents 283e42f5 d677691e
Inline Side-by-side
Showing with 117 additions and 108 deletions
code/moya-beans-client/ejbModule/fi/codecrew/moya/beans/EventBeanLocal.java
......@@ -71,4 +71,6 @@ public interface EventBeanLocal {
List<LanEvent> findFutureAndRunningEventsForCurrentUser();
List<LanEvent> findFutureEvents();
List<LanEvent> findAllEventsForOrganizer(EventOrganiser organiser);
}
code/moya-beans/ejbModule/fi/codecrew/moya/beans/EventBean.java
/*
* Copyright Codecrew Ry
*
*
* All rights reserved.
*
* This license applies to any software containing a notice placed by the
* copyright holder. Such software is herein referred to as the Software.
* This license covers modification, distribution and use of the Software.
*
* Any distribution and use in source and binary forms, with or without
* modification is not permitted without explicit written permission from the
* copyright owner.
*
* A non-exclusive royalty-free right is granted to the copyright owner of the
* Software to use, modify and distribute all modifications to the Software in
* future versions of the Software.
*
*
* This license applies to any software containing a notice placed by the
* copyright holder. Such software is herein referred to as the Software.
* This license covers modification, distribution and use of the Software.
*
* Any distribution and use in source and binary forms, with or without
* modification is not permitted without explicit written permission from the
* copyright owner.
*
* A non-exclusive royalty-free right is granted to the copyright owner of the
* Software to use, modify and distribute all modifications to the Software in
* future versions of the Software.
*
*/
package fi.codecrew.moya.beans;
......@@ -289,7 +289,7 @@ public class EventBean implements EventBeanLocal {
public LanEventPrivateProperty saveOrCreatePrivateProperty(LanEventPrivateProperty privateProperty) {
LanEventPrivateProperty ret = null;
logger.info("Saving property {}, eventorg {}, key {}", new Object[] { privateProperty.getEvent(), privateProperty.getEventorg(), privateProperty.getKey() });
if (privateProperty.getId() == null) {
ret = privateProperty;
eventPrivatePropertyFacade.create(privateProperty);
......@@ -373,4 +373,10 @@ public class EventBean implements EventBeanLocal {
return eventFacade.findFutureEvents();
}
@Override
@RolesAllowed(EventPermission.S_MANAGE_EVENT)
public List<LanEvent> findAllEventsForOrganizer(EventOrganiser organiser) {
return eventFacade.findForOrganizer(organiser);
}
}
code/moya-beans/ejbModule/fi/codecrew/moya/facade/EventFacade.java
......@@ -128,4 +128,13 @@ public class EventFacade extends IntegerPkGenericFacade<LanEvent> {
return getEm().createQuery(cq).getResultList();
}
public List<LanEvent> findForOrganizer(EventOrganiser organizer) {
CriteriaBuilder cb = getEm().getCriteriaBuilder();
CriteriaQuery<LanEvent> cq = cb.createQuery(LanEvent.class);
Root<LanEvent> root = cq.from(LanEvent.class);
cq.where(cb.equal(root.get(LanEvent_.organiser), organizer));
return getEm().createQuery(cq).getResultList();
}
}
code/moya-database/src/main/java/fi/codecrew/moya/model/EventOrganiser.java
......@@ -42,10 +42,6 @@ public class EventOrganiser extends GenericEntity {
@Column(name = "bundle_country")
private String bundleCountry;
@OrderBy
@OneToMany(cascade = CascadeType.ALL, mappedBy = "organiser")
private List<LanEvent> events;
@Column(nullable = false, name = "bill_address1")
private String billAddress1 = "";
@Column(nullable = false, name = "bill_address2")
......@@ -63,14 +59,6 @@ public class EventOrganiser extends GenericEntity {
@Column(nullable = false, name = "bank_name2")
private String bankName2 = "";
public List<LanEvent> getEvents() {
return events;
}
public void setEvents(List<LanEvent> eventList) {
this.events = eventList;
}
/**
* @return the organisation
*/
......
code/moya-database/src/main/java/fi/codecrew/moya/model/LanEventPropertyKey.java
......@@ -63,7 +63,7 @@ public enum LanEventPropertyKey {
EVENT_CURRENCY_CODE(Type.TEXT, "EUR");
;
private enum Type {
public enum Type {
TEXT, DATE, DATA, BOOL, LONG
};
......
code/moya-web/WebContent/eventorg/edit.xhtml
......@@ -70,7 +70,7 @@
</h:form>
<h2>#{i18n['eventorg.events']}</h2>
<h:dataTable border="1" id="org" value="#{eventorgView.eventorg.events}" var="event">
<h:dataTable border="1" id="org" value="#{eventorgView.organizersEvents}" var="event">
<h:column>
<f:facet name="header">
<h:outputText value="${i18n['event.name']}" />
......
code/moya-web/WebContent/eventorg/editEvent.xhtml
......@@ -129,7 +129,7 @@
<p:fieldset legend="Tools" toggleable="true" collapsed="true">
<h:form>
<p:selectOneMenu value="#{eventorgView.copyParty}" converter="#{lanEventConverter}">
<f:selectItems value="#{eventorgView.event.organiser.events}" var="e" itemLabel="#{e.name}" />
<f:selectItems value="#{eventorgView.organizersEvents}" var="e" itemLabel="#{e.name}" />
</p:selectOneMenu>
<h:commandButton action="#{eventorgView.copySiteContent}" value="#{i18n['event.copySiteContent']}" />
......@@ -194,26 +194,26 @@
<h:form id="propertyEditForm" rendered="#{!empty eventPropertyView.property}" enctype="#{eventPropertyView.property.key.data?'multipart/form-data':''}" styleClass="moya_datatable2">
<h:panelGrid columns="3">
<h:outputLabel for="key" value="#{i18n['lanEventProperty.key']}" />
<h:outputText value="#{eventPropertyView.property.key}" id="key" />
<h:message for="key" />
<h:outputLabel for="propkey" value="#{i18n['lanEventProperty.key']}" />
<h:outputText value="#{eventPropertyView.property.key}" id="propkey" />
<h:message for="propkey" />
<h:outputLabel for="defaultval" value="#{i18n['lanEventProperty.defaultValue']}" />
<h:outputText id="defaultval" value="#{eventPropertyView.property.key.defaultvalue}" />
<h:message for="defaultval" />
<h:outputLabel rendered="#{eventPropertyView.property.key.text or eventPropertyView.property.key.data }" for="textval" value="#{i18n['lanEventProperty.textValue']}" />
<h:inputText rendered="#{eventPropertyView.property.key.text or eventPropertyView.property.key.data}" id="textval" value="#{eventPropertyView.property.textvalue}" />
<h:inputText rendered="#{eventPropertyView.property.key.text or eventPropertyView.property.key.data}" id="textval" value="#{eventPropertyView.property.textvalue}" size="60" />
<h:message rendered="#{eventPropertyView.property.key.text or eventPropertyView.property.key.data}" for="textval" />
<h:outputLabel rendered="#{eventPropertyView.property.key.data}" for="dataval" value="#{i18n['lanEventProperty.datavalue']}" />
<p:fileUpload rendered="#{ eventPropertyView.property.key.data}" mode="simple" value="#{eventPropertyView.file}" id="dataval" />
<p:fileUpload rendered="#{ eventPropertyView.property.key.data}" id="dataval" mode="simple" value="#{eventPropertyView.file}" />
<h:message rendered="#{eventPropertyView.property.key.data}" for="dataval" />
<h:outputLabel rendered="#{eventPropertyView.property.key.date}" for="textval" value="#{i18n['lanEventProperty.textValue']}" />
<p:calendar rendered="#{eventPropertyView.property.key.date}" value="#{eventPropertyView.property.dateValue}" pattern="#{sessionHandler.datetimeFormat}" />
<h:message rendered="#{eventPropertyView.property.key.date}" for="textval" />
<h:outputLabel rendered="#{eventPropertyView.property.key.date}" for="dateval" value="#{i18n['lanEventProperty.textValue']}" />
<p:calendar rendered="#{eventPropertyView.property.key.date}" id="dateval" value="#{eventPropertyView.property.dateValue}" pattern="#{sessionHandler.datetimeFormat}" />
<h:message rendered="#{eventPropertyView.property.key.date}" for="dateval" />
<h:outputLabel rendered="#{eventPropertyView.property.key.boolean}" for="booleanval" value="#{i18n['lanEventProperty.booleanValue']}" />
<h:selectBooleanCheckbox rendered="#{eventPropertyView.property.key.boolean}" id="booleanval" value="#{eventPropertyView.property.booleanValue}" />
......@@ -273,17 +273,17 @@
<h:outputText value="#{eventPropertyView.privateProperty.key}" id="key" />
<h:message for="key" />
<h:outputLabel for="defaultval" value="#{i18n['lanEventPrivateProperty.defaultValue']}" />
<h:outputText id="defaultval" value="#{eventPropertyView.privateProperty.key.defaultvalue}" />
<h:message for="defaultval" />
<h:outputLabel for="privDefaultval" value="#{i18n['lanEventPrivateProperty.defaultValue']}" />
<h:outputText id="privDefaultval" value="#{eventPropertyView.privateProperty.key.defaultvalue}" />
<h:message for="privDefaultval" />
<h:outputLabel rendered="#{eventPropertyView.privateProperty.key.text}" for="textval" value="#{i18n['lanEventPrivateProperty.textValue']}" />
<h:inputText rendered="#{eventPropertyView.privateProperty.key.text}" id="textval" value="#{eventPropertyView.privateProperty.textvalue}" />
<h:message rendered="#{eventPropertyView.privateProperty.key.text}" for="textval" />
<h:outputLabel rendered="#{eventPropertyView.privateProperty.key.text}" for="privTextval" value="#{i18n['lanEventPrivateProperty.textValue']}" />
<h:inputText rendered="#{eventPropertyView.privateProperty.key.text}" id="privTextval" value="#{eventPropertyView.privateProperty.textvalue}" />
<h:message rendered="#{eventPropertyView.privateProperty.key.text}" for="privTextval" />
<h:outputLabel rendered="#{eventPropertyView.privateProperty.key.date}" for="textval" value="#{i18n['lanEventPrivateProperty.textValue']}" />
<p:calendar rendered="#{eventPropertyView.privateProperty.key.date}" value="#{eventPropertyView.privateProperty.dateValue}" pattern="#{sessionHandler.datetimeFormat}" />
<h:message rendered="#{eventPropertyView.privateProperty.key.date}" for="textval" />
<h:outputLabel rendered="#{eventPropertyView.privateProperty.key.date}" for="privDateval" value="#{i18n['lanEventPrivateProperty.textValue']}" />
<p:calendar rendered="#{eventPropertyView.privateProperty.key.date}" id="privDateval" value="#{eventPropertyView.privateProperty.dateValue}" pattern="#{sessionHandler.datetimeFormat}" />
<h:message rendered="#{eventPropertyView.privateProperty.key.date}" for="privDateval" />
</h:panelGrid>
<p:commandButton ajax="false" action="#{eventPropertyView.savePrivateProperty}" value="#{i18n['lanEventPrivateProperty.save']}" update=":privatePropertyEditor" />
......
code/moya-web/src/main/java/fi/codecrew/moya/handler/SessionHandler.java
......@@ -127,7 +127,11 @@ public class SessionHandler {
if (template == null) {
template = eventbean.getPropertyString(LanEventPropertyKey.EVENT_LAYOUT);
}
if (template == null) {
if(template != null){
template = template.trim().toLowerCase();
}
if (template == null || template.isEmpty()) {
template = "primelayout";
}
return template;
......
code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/organisation/EventOrgView.java
......@@ -70,6 +70,7 @@ public class EventOrgView extends GenericCDIView {
private String eventname;
private List<EventOrganiser> organisations;
private List<LanEvent> oragnizersEvents;
private Integer eventid;
......@@ -86,28 +87,38 @@ public class EventOrgView extends GenericCDIView {
ScheduleModel eventsCalendar = null;
public void initCreate()
{
public void initCreate() {
if (super.requirePermissions(user.getUser().isSuperadmin())) {
super.beginConversation();
}
}
public String removeDomain()
{
public String removeDomain() {
event.getDomains().remove(eventdomains.getRowData());
setEvent(eventbean.mergeChanges(event));
return null;
}
public String saveEvent()
{
public List<LanEvent> getOrganizersEvents() {
if (oragnizersEvents == null) {
EventOrganiser org = eventorg;
if (org == null && event != null) {
org = event.getOrganiser();
}
if (org != null) {
oragnizersEvents = eventbean.findAllEventsForOrganizer(org);
}
}
return oragnizersEvents;
}
public String saveEvent() {
setEvent(eventbean.mergeChanges(event));
return null;
}
public String saveEventorg()
{
public String saveEventorg() {
setEventorg(eventbean.mergeChanges(eventorg));
return null;
}
......@@ -145,39 +156,29 @@ public class EventOrgView extends GenericCDIView {
}
}
public void initEditEvent()
{
if (eventid != null && super.requirePermissions(user.getUser().isSuperadmin() || eventorgbean.hasEventPermission(eventid)) && getEvent() == null)
{
public void initEditEvent() {
if (eventid != null && super.requirePermissions(user.getUser().isSuperadmin() || eventorgbean.hasEventPermission(eventid)) && getEvent() == null) {
setEvent(eventorgbean.findEvent(eventid));
super.beginConversation();
} else if (super.requirePermissions(EventPermission.MANAGE_PROPERTIES) && getEvent() == null)
{
} else if (super.requirePermissions(EventPermission.MANAGE_PROPERTIES) && getEvent() == null) {
setEvent(eventbean.getCurrentEvent());
super.beginConversation();
}
}
public String createEvent()
{
if (eventorg.getEvents() == null) {
eventorg.setEvents(new ArrayList<LanEvent>());
}
public String createEvent() {
event = new LanEvent();
event.setName(eventname);
event.setOrganiser(eventorg);
eventname = "";
eventorg.getEvents().add(getEvent());
eventbean.create(event);
//eventorg = eventorgbean.save(eventorg);
return "/eventorg/editEvent";
}
public String create()
{
public String create() {
eventorg = eventorgbean.create(createorgname);
createorgname = "";
......@@ -314,7 +315,7 @@ public class EventOrgView extends GenericCDIView {
public List<User> getSuperUsers() {
if(!permbean.getCurrentUser().isSuperadmin())
if (!permbean.getCurrentUser().isSuperadmin())
return new ArrayList<User>();
return userBean.findSuperusers();
......
code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/organisation/EventPropertyView.java
......@@ -64,11 +64,9 @@ public class EventPropertyView extends GenericCDIView {
private LanEventPrivateProperty privateProperty;
public List<LanEventPropertyKey> getAvailablePropertyKeys()
{
public List<LanEventPropertyKey> getAvailablePropertyKeys() {
List<LanEventPropertyKey> ret = new ArrayList<LanEventPropertyKey>(Arrays.asList(LanEventPropertyKey.values()));
if (createKey != null)
{
if (createKey != null) {
ret.remove(createKey);
}
if (eventorgview.getEvent() != null) {
......@@ -81,11 +79,9 @@ public class EventPropertyView extends GenericCDIView {
public List<LanEventPrivatePropertyKey> getAvailablePrivatePropertyKeys() {
List<LanEventPrivatePropertyKey> ret = null;
if (isPrivatePropertyPermission() && eventbean.getCurrentEvent().equals(eventorgview.getEvent()))
{
if (isPrivatePropertyPermission() && eventbean.getCurrentEvent().equals(eventorgview.getEvent())) {
ret = new ArrayList<LanEventPrivatePropertyKey>(Arrays.asList(LanEventPrivatePropertyKey.values()));
if (createPrivateKey != null)
{
if (createPrivateKey != null) {
ret.remove(createPrivateKey);
}
for (LanEventPrivateProperty p : eventbean.getPrivateProperties()) {
......@@ -99,22 +95,19 @@ public class EventPropertyView extends GenericCDIView {
return super.hasPermission(EventPermission.MANAGE_PRIVATE_PROPERTIES) && eventbean.getCurrentEvent().equals(eventorgview.getEvent());
}
public String editProperty()
{
public String editProperty() {
property = properties.getRowData();
logger.info("Editing property {}", property);
return null;
}
public String editPrivateProperty()
{
public String editPrivateProperty() {
privateProperty = privateProperties.getRowData();
logger.info("Editing property {}", privateProperty);
return null;
}
public String initPrivatePropertyKeyCreate()
{
public String initPrivatePropertyKeyCreate() {
logger.info("Creating new priavte key for event {}, key: {}", eventorgview.getEvent(), createPrivateKey);
privateProperty = new LanEventPrivateProperty();
// property.setEventorg(eventorgview.getEvent().getOrganiser());
......@@ -135,11 +128,9 @@ public class EventPropertyView extends GenericCDIView {
return null;
}
public String savePrivateProperty()
{
logger.info("Saving property {}, eventorg {}, key {}", new Object[] { privateProperty.getEvent(), privateProperty.getEventorg(), privateProperty.getKey() });
if (privateProperty.getKey().isData() && file != null)
{
public String savePrivateProperty() {
logger.info("Saving property {}, eventorg {}, key {}", new Object[]{privateProperty.getEvent(), privateProperty.getEventorg(), privateProperty.getKey()});
if (privateProperty.getKey().isData() && file != null) {
byte[] contents = null;
if (file.getContents() != null) {
contents = file.getContents();
......@@ -167,22 +158,34 @@ public class EventPropertyView extends GenericCDIView {
return null;
}
public String initPropertyKeyCreate()
{
public String initPropertyKeyCreate() {
logger.info("Creating new key for event {}, key: {}", eventorgview.getEvent(), createKey);
property = new LanEventProperty();
// property.setEventorg(eventorgview.getEvent().getOrganiser());
property.setEvent(eventorgview.getEvent());
property.setKey(createKey);
switch (property.getKey().getType()) {
case TEXT:
property.setTextvalue(property.getKey().getDefaultvalue());
break;
case BOOL:
if (property.getKey().getDefaultvalue() != null &&
property.getKey().getDefaultvalue().equals("1")) {
property.setBooleanValue(true);
}
break;
case LONG:
property.setLongValue(property.getKey().getDefaultLong());
break;
default:
}
return null;
}
public String saveProperty()
{
logger.info("Saving property {}, eventorg {}, key {}, ", new Object[] { property.getEvent(), property.getEventorg(), property.getKey() });
public String saveProperty() {
logger.info("Saving property {}, eventorg {}, key {}, ", new Object[]{property.getEvent(), property.getEventorg(), property.getKey()});
logger.debug("Is data: {} File {}", property.getKey().isData(), file);
if (property.getKey().isData() && file != null)
{
if (property.getKey().isData() && file != null) {
logger.info("saving data values type: {}, length {}", file.getContentType(), file.getSize());
byte[] contents = null;
if (file.getContents() != null) {
......
code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/user/CreditTransferView.java
......@@ -61,8 +61,7 @@ public class CreditTransferView extends GenericCDIView {
wrap.add(new EventUserWrapper(u));
}
this.users = wrap;
events = eventbean.getCurrentEvent().getOrganiser().getEvents();
events = eventbean.findAllEventsForOrganizer(eventbean.getCurrentEvent().getOrganiser());
}
public String selectEvent() {
......
code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/user/RoleView.java
......@@ -98,7 +98,7 @@ public class RoleView extends GenericCDIView {
// By default this returns only 20 first results.
UserSearchQuery usq = new UserSearchQuery();
usq.setSearch(user);
usq.setOnlyThisEvent(false);
usq.setOnlyThisEvent(true);
SearchResult<User> ret = userbean.getUsers(usq);
return ret.getResults();
}
......
code/moya-web/src/main/java/fi/codecrew/moya/web/converter/CurrentEventorgEventConverter.java
......@@ -37,14 +37,11 @@ public class CurrentEventorgEventConverter extends GenericIntegerEntityConverter
protected LanEvent find(Integer id) {
LanEvent ret = null;
LanEvent curr = eventbean.getCurrentEvent();
if (curr.getId().equals(id))
{
if (curr.getId().equals(id)) {
ret = curr;
} else {
for (LanEvent e : curr.getOrganiser().getEvents())
{
if (e.getId().equals(id))
{
for (LanEvent e : eventbean.findAllEventsForOrganizer(curr.getOrganiser())) {
if (e.getId().equals(id)) {
ret = e;
break;
}
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!