DMC/scipro
7
0
Fork 0
Code Issues40 Pull Requests8 Actions Projects1 Releases Wiki Activity

Merge branch 'smallFix' into develop

Browse Source
This commit is contained in:
Emil Siverhall 2013-01-24 15:11:23 +01:00
commit 1bfbc66209
1 changed files with 1 additions and 1 deletions

2
src/main/java/se/su/dsv/scipro/admin/panels/AdminNewIdeaDetailsCrudPanel.java

@ -73,7 +73,7 @@ public abstract class AdminNewIdeaDetailsCrudPanel extends Panel {
String periodString = idea.getApplicationPeriod() != null ? idea.getApplicationPeriod().getName()+ " "
+ format(idea.getApplicationPeriod().getStartDate(), null)+ " - "+ format(idea.getApplicationPeriod().getEndDate(), null)
+ " Course start: "+ format(idea.getApplicationPeriod().getCourseStartDate(), null) : "None";
String meetingString = idea.getFirstMeeting()!=null?format(idea.getFirstMeeting().getFirstMeetingDate(), FORMAT.EXTENDED) + ", "+idea.getFirstMeeting().getDescription():"None";
String meetingString = idea.getFirstMeeting()!=null?format(idea.getFirstMeeting().getFirstMeetingDate(), FORMAT.EXTENDED) + ", "+idea.getFirstMeeting().getRoom():"None";
String areaString = idea.getResearchArea()!=null?idea.getResearchArea().getTitle():"No research area selected";
container.add(new Label("level", idea.getProjectClass().getName()));