diff --git a/src/main/java/se/su/dsv/scipro/admin/pages/match/AutomaticMatchPanel.java b/src/main/java/se/su/dsv/scipro/admin/pages/match/AutomaticMatchPanel.java index 245896dbfc..adf82df1b6 100644 --- a/src/main/java/se/su/dsv/scipro/admin/pages/match/AutomaticMatchPanel.java +++ b/src/main/java/se/su/dsv/scipro/admin/pages/match/AutomaticMatchPanel.java @@ -141,7 +141,7 @@ public class AutomaticMatchPanel extends Panel { for (Match match : result1.matches) { if(match.getPoints() >= points) { match.setCreatedBy(SciProSession.get().getUser()); - + match.setStatus(Match.Status.CONFIRMED); match = matchDao.save(match); diff --git a/src/main/java/se/su/dsv/scipro/admin/pages/settings/AdminGeneralSettingsPage.html b/src/main/java/se/su/dsv/scipro/admin/pages/settings/AdminGeneralSettingsPage.html index dc4d4f8323..1de7afe6b2 100644 --- a/src/main/java/se/su/dsv/scipro/admin/pages/settings/AdminGeneralSettingsPage.html +++ b/src/main/java/se/su/dsv/scipro/admin/pages/settings/AdminGeneralSettingsPage.html @@ -38,18 +38,18 @@ <!--<td><input name="7" type="checkbox" wicket:id="remoteExport" />--> <!--</td>--> <!--</tr>--> - <tr> - <td><label for="7">Supervisors can accept and decline project ideas:</label> - </td> - <td><input name="7" type="checkbox" wicket:id="supervisorsCanAcceptDeclinePIs" /> - </td> - </tr> - <tr> - <td><label for="7">Matching algorithm matches are force accepted:</label> - </td> - <td><input name="7" type="checkbox" wicket:id="matchAlgorithmMatchesAreForceAccepted" /> - </td> - </tr> + <!--<tr>--> + <!--<td><label for="7">Supervisors can accept and decline project ideas:</label>--> + <!--</td>--> + <!--<td><input name="7" type="checkbox" wicket:id="supervisorsCanAcceptDeclinePIs" />--> + <!--</td>--> + <!--</tr>--> + <!--<tr>--> + <!--<td><label for="7">Matching algorithm matches are force accepted:</label>--> + <!--</td>--> + <!--<td><input name="7" type="checkbox" wicket:id="matchAlgorithmMatchesAreForceAccepted" />--> + <!--</td>--> + <!--</tr>--> </table> diff --git a/src/main/java/se/su/dsv/scipro/admin/pages/settings/AdminGeneralSettingsPage.java b/src/main/java/se/su/dsv/scipro/admin/pages/settings/AdminGeneralSettingsPage.java index 04aba0a5ea..cfcd5e7c32 100644 --- a/src/main/java/se/su/dsv/scipro/admin/pages/settings/AdminGeneralSettingsPage.java +++ b/src/main/java/se/su/dsv/scipro/admin/pages/settings/AdminGeneralSettingsPage.java @@ -38,16 +38,14 @@ public class AdminGeneralSettingsPage extends AbstractAdminSettingsPage { TextField<String> smtpServer = new RequiredTextField<String>("smtpServer"); CheckBox remoteExport = new CheckBox("remoteExport"); CheckBox mailNotifications = new CheckBox("mailNotifications"); - CheckBox supervisorsCanAcceptDeclinePIs = new CheckBox("supervisorsCanAcceptDeclinePIs"); - CheckBox matchAlgorithmMatchesAreForceAccepted = new CheckBox("matchAlgorithmMatchesAreForceAccepted"); + add(mailFromName); add(systemFromMail); add(smtpServer); add(mailNotifications); - add(remoteExport); - add(supervisorsCanAcceptDeclinePIs); - add(matchAlgorithmMatchesAreForceAccepted); +// add(remoteExport); + } @Override