diff --git a/resources/db_update_scripts/current.sql b/resources/db_update_scripts/current.sql index e69de29bb2..e70c3576f1 100644 --- a/resources/db_update_scripts/current.sql +++ b/resources/db_update_scripts/current.sql @@ -0,0 +1,2 @@ +alter table `general_system_settings` drop column matchAlgorithmMatchesAreForceAccepted; +alter table `general_system_settings` drop column supervisorsCanAcceptDeclinePIs; \ No newline at end of file diff --git a/src/main/java/se/su/dsv/scipro/data/dataobjects/GeneralSystemSettings.java b/src/main/java/se/su/dsv/scipro/data/dataobjects/GeneralSystemSettings.java index 6c1ac7ae30..e1d2d8c14a 100644 --- a/src/main/java/se/su/dsv/scipro/data/dataobjects/GeneralSystemSettings.java +++ b/src/main/java/se/su/dsv/scipro/data/dataobjects/GeneralSystemSettings.java @@ -65,28 +65,6 @@ public class GeneralSystemSettings extends DomainObject{ @Basic(optional=true) private int projectPartnerDaysToLive; -// @Basic(optional=false) -// private boolean supervisorsCanAcceptDeclinePIs = true; -// -// public boolean getSupervisorsCanAcceptDeclinePIs(){ -// return supervisorsCanAcceptDeclinePIs; -// } -// -// public void setSupervisorsCanAcceptDeclinePIs(boolean supervisorsCanAcceptDeclinePIs){ -// this.supervisorsCanAcceptDeclinePIs = supervisorsCanAcceptDeclinePIs; -// } -// -// @Basic(optional=false) -// private boolean matchAlgorithmMatchesAreForceAccepted = true; -// -// public boolean isMatchAlgorithmMatchesAreForceAccepted() { -// return matchAlgorithmMatchesAreForceAccepted; -// } -// -// public void setMatchAlgorithmMatchesAreForceAccepted(boolean matchAlgorithmMatchesAreForceAccepted) { -// this.matchAlgorithmMatchesAreForceAccepted = matchAlgorithmMatchesAreForceAccepted; -// } - @Basic(optional=false) private boolean finalSeminarThesisMustBeAPDF = false;