RenJuan/TASKPM
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix returned values when the configuration is not loaded in

Browse source 
BaseCalendarModel and in the EntitySequenceDao.

FEA: ItEr75S05CalendarAdminInterfaceItEr74S06
This commit is contained in:
Susana Montes Pedreira 2011-07-13 15:24:39 +02:00
parent ae8936afd1
commit 1278d8157e
2 changed files with 16 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
navalplanner-business/src/main/java/org/navalplanner/business/common/daos/EntitySequenceDAO.java
View file

@ -88,10 +88,16 @@ public class EntitySequenceDAO extends
@Override
public EntitySequence getActiveEntitySequence(EntityNameEnum entityName)
throws InstanceNotFoundException, NonUniqueResultException {
return (EntitySequence) getSession().createCriteria(
EntitySequence entitySequence = (EntitySequence) getSession()
.createCriteria(
EntitySequence.class).add(
Restrictions.eq("entityName", entityName)).add(
Restrictions.eq("active", true)).uniqueResult();
if (entitySequence == null) {
throw new InstanceNotFoundException(entitySequence,
"Entity sequence not exist");
}
return entitySequence;
}
@Override

13
navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarModel.java
View file

@ -118,8 +118,11 @@ public class BaseCalendarModel extends IntegrationEntityModel implements
@Transactional(readOnly = true)
public void initCreate() {
editing = false;
boolean codeGenerated = configurationDAO.getConfiguration()
.getGenerateCodeForBaseCalendars();
boolean codeGenerated = (configurationDAO.getConfiguration() != null) ? configurationDAO
.getConfiguration().getGenerateCodeForBaseCalendars()
: false;
this.baseCalendar = BaseCalendar.createBasicCalendar();
if (codeGenerated) {
@ -149,8 +152,10 @@ public class BaseCalendarModel extends IntegrationEntityModel implements
forceLoad(this.baseCalendar);
this.baseCalendar.setCode("");
boolean codeGenerated = configurationDAO.getConfiguration()
.getGenerateCodeForBaseCalendars();
boolean codeGenerated = (configurationDAO.getConfiguration() != null) ? configurationDAO
.getConfiguration().getGenerateCodeForBaseCalendars()
: false;
if (codeGenerated) {
setDefaultCode();
}