diff --git a/WebApp/WebContent/WEB-INF/templates/menu_page.xhtml b/WebApp/WebContent/WEB-INF/templates/menu_page.xhtml index 5f65c5840..29dd97ebe 100644 --- a/WebApp/WebContent/WEB-INF/templates/menu_page.xhtml +++ b/WebApp/WebContent/WEB-INF/templates/menu_page.xhtml @@ -22,7 +22,7 @@ + rendered="#{User.adminUser and dataSetsBean.submissionEnabled()}"> diff --git a/WebApp/WebContent/dataset/dataset_list.xhtml b/WebApp/WebContent/dataset/dataset_list.xhtml index 7e1f78834..c620a823f 100644 --- a/WebApp/WebContent/dataset/dataset_list.xhtml +++ b/WebApp/WebContent/dataset/dataset_list.xhtml @@ -366,31 +366,33 @@ styleClass="actionIcon" alt="Export" title="Export" /> - - - - - - - - - + - - + rendered="#{dataset.status eq DataSet.STATUS_READY_FOR_SUBMISSION}"> + + - + rendered="#{dataset.status ne DataSet.STATUS_READY_FOR_SUBMISSION}"> + + + + + + + + + + + diff --git a/WebApp/src/uk/ac/exeter/QuinCe/web/BaseManagedBean.java b/WebApp/src/uk/ac/exeter/QuinCe/web/BaseManagedBean.java index 2d7ea19f5..c93a98d2b 100644 --- a/WebApp/src/uk/ac/exeter/QuinCe/web/BaseManagedBean.java +++ b/WebApp/src/uk/ac/exeter/QuinCe/web/BaseManagedBean.java @@ -745,4 +745,14 @@ public boolean getAjaxOK() { public void setAjaxOK(boolean ok) { // Ignore all attempts to set this value } + + /** + * Determine whether or not the submission system is enabled. + * + * @return {@code true} if submissions are enabled; {@code false} if not. + */ + public boolean submissionEnabled() { + return Boolean + .valueOf(getAppConfig().getProperty("submission_enabled", "true")); + } } diff --git a/configuration/quince.properties b/configuration/quince.properties index 9c63f6963..c8f5e9d97 100644 --- a/configuration/quince.properties +++ b/configuration/quince.properties @@ -17,3 +17,4 @@ diagnostic_sensors=Temperature,Pressure,Air Flow,Water Flow,Voltage version=%quince_version% instance_credits=%instance_credits% instance_host=%instance_host% +submission_enabled=%submission_enabled%