DMC/scipro
7
0
Fork 0
Code Issues28 Pull Requests3 Actions Projects1 Releases Wiki Activity

Added fix for auto-initialization of project-classes, not optimal.

Browse Source
This commit is contained in:
Robin Eklund 2011-08-08 16:51:57 +02:00
parent 14fc1c6d30
commit d60ca5da7c
3 changed files with 3 additions and 3 deletions
src/main/java/se/su/dsv/scipro
DataInitialiser.java
data/dao
interfaces
ProjectClassDao.java
jpa
ProjectClassDaoJPAImp.java

2
src/main/java/se/su/dsv/scipro/DataInitialiser.java

@ -30,7 +30,7 @@ public class DataInitialiser {
createDefaultUsers();
}
private void createDefaultProjectClasses(){
if(projectClassDao.countAll() < 3){
if( (projectClassDao.countAll() + projectClassDao.countAllLazyDeleted()) < 3){
final ProjectClass masterClass = new ProjectClass(ProjectClass.MASTER,"Master","Master degree thesis project");;
final ProjectClass bachelorClass = new ProjectClass(ProjectClass.BACHELOR,"Bachelor","Bachelor degree thesis project");;
final ProjectClass unknownClass = new ProjectClass(ProjectClass.UNKNOWN,"Unknown","Project class is unknown or could not be determined");

2
src/main/java/se/su/dsv/scipro/data/dao/interfaces/ProjectClassDao.java

@ -4,7 +4,7 @@ import java.util.List;
import se.su.dsv.scipro.data.dataobjects.ProjectClass;
public interface ProjectClassDao extends Dao<ProjectClass>{
public interface ProjectClassDao extends LazyDeleteDao<ProjectClass>{
ProjectClass getProjectClass(String projectCode);

2
src/main/java/se/su/dsv/scipro/data/dao/jpa/ProjectClassDaoJPAImp.java

@ -7,10 +7,10 @@ import javax.persistence.NoResultException;
import javax.persistence.PersistenceException;
import javax.persistence.TypedQuery;
import org.hibernate.ejb.QueryHints;
import org.springframework.orm.jpa.JpaCallback;
import org.springframework.stereotype.Repository;
import org.springframework.transaction.annotation.Transactional;
import se.su.dsv.scipro.data.dao.interfaces.ProjectClassDao;
import se.su.dsv.scipro.data.dataobjects.ProjectClass;
/**