DMC/scipro
7
0
Fork 0
Code Issues42 Pull Requests4 Actions Projects1 Releases Wiki Activity

Merge branch 'meeting_fix' into develop

Browse Source
This commit is contained in:
Emil Siverhall 2013-04-02 23:21:53 +02:00
commit 37dcf999c8
1 changed files with 2 additions and 1 deletions

3
src/main/java/se/su/dsv/scipro/supervisor/panels/SupervisorNewIdeaDetailsPanel.java

@ -25,7 +25,8 @@ public class SupervisorNewIdeaDetailsPanel extends Panel {
public SupervisorNewIdeaDetailsPanel(String id, IModel<NewIdea> model) {
super(id, model);
boolean showFirstMeeting = model.getObject().getMatch().getStatus().equals(Status.MATCHED)
boolean showFirstMeeting = (model.getObject().getMatch().getStatus().equals(Status.MATCHED)
|| model.getObject().getMatch().getStatus().equals(Status.COMPLETED))
&& !ideaService.hasUnconfirmedParticipation(model.getObject());
add(new NewIdeaExportPanel("exportStatus", model));