Skip to content

Submissions can be disabled #3215

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 27, 2025
Merged

Submissions can be disabled #3215

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5d60767
(#3214) Config file update
squaregoldfish Nov 27, 2025
ce245f6
(#3214) Submissions can be disabled
squaregoldfish Nov 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion WebApp/WebContent/WEB-INF/templates/menu_page.xhtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<p:menuitem value="Jobs" outcome="/job/job_list.xhtml"
rendered="#{User.jobManager}"></p:menuitem>
<p:menuitem value="Waiting for Approval" outcome="/dataset/for_approval_list.xhtml"
rendered="#{User.adminUser}"></p:menuitem>
rendered="#{User.adminUser and dataSetsBean.submissionEnabled()}"></p:menuitem>
<p:menuitem value="NRT Status" outcome="/job/nrt_status.xhtml"
rendered="#{User.adminUser}"></p:menuitem>
<p:menuitem value="Credits" outcome="/credits.xhtml"></p:menuitem>
Expand Down
44 changes: 23 additions & 21 deletions WebApp/WebContent/dataset/dataset_list.xhtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -366,31 +366,33 @@
styleClass="actionIcon" alt="Export" title="Export" />
</ui:fragment>
<ui:fragment rendered="#{!dataset.nrt}">
<ui:fragment
rendered="#{dataset.status eq DataSet.STATUS_READY_FOR_SUBMISSION}">
<p:commandLink onclick="submitForApproval(#{dataset.id})">
<h:graphicImage value="/resources/image/submit.svg"
styleClass="actionIcon" alt="Submit" title="Submit" />
</p:commandLink>
</ui:fragment>
<ui:fragment
rendered="#{dataset.status ne DataSet.STATUS_READY_FOR_SUBMISSION}">
<h:graphicImage value="/resources/image/submit_disabled.svg"
styleClass="actionIcon" alt="Submit" title="Submit" />
</ui:fragment>
<ui:fragment rendered="#{dataSetsBean.approvalUser}">
<ui:fragment rendered="#{dataSetsBean.submissionEnabled()}">
<ui:fragment
rendered="#{dataset.status eq DataSet.STATUS_WAITING_FOR_APPROVAL}">
<p:commandLink onclick="approve(#{dataset.id})">
<h:graphicImage value="/resources/image/approve.svg"
styleClass="actionIcon" alt="Approve" title="Approve" />
rendered="#{dataset.status eq DataSet.STATUS_READY_FOR_SUBMISSION}">
<p:commandLink onclick="submitForApproval(#{dataset.id})">
<h:graphicImage value="/resources/image/submit.svg"
styleClass="actionIcon" alt="Submit" title="Submit" />
</p:commandLink>
</ui:fragment>
<ui:fragment
rendered="#{dataset.status ne DataSet.STATUS_WAITING_FOR_APPROVAL}">
<h:graphicImage
value="/resources/image/approve_disabled.svg"
styleClass="actionIcon" alt="Approve" title="Approve" />
rendered="#{dataset.status ne DataSet.STATUS_READY_FOR_SUBMISSION}">
<h:graphicImage value="/resources/image/submit_disabled.svg"
styleClass="actionIcon" alt="Submit" title="Submit" />
</ui:fragment>
<ui:fragment rendered="#{dataSetsBean.approvalUser}">
<ui:fragment
rendered="#{dataset.status eq DataSet.STATUS_WAITING_FOR_APPROVAL}">
<p:commandLink onclick="approve(#{dataset.id})">
<h:graphicImage value="/resources/image/approve.svg"
styleClass="actionIcon" alt="Approve" title="Approve" />
</p:commandLink>
</ui:fragment>
<ui:fragment
rendered="#{dataset.status ne DataSet.STATUS_WAITING_FOR_APPROVAL}">
<h:graphicImage
value="/resources/image/approve_disabled.svg"
styleClass="actionIcon" alt="Approve" title="Approve" />
</ui:fragment>
</ui:fragment>
</ui:fragment>
<ui:fragment rendered="#{dataset.status ge DataSet.STATUS_USER_QC}">
Expand Down
10 changes: 10 additions & 0 deletions WebApp/src/uk/ac/exeter/QuinCe/web/BaseManagedBean.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"));
}
}
1 change: 1 addition & 0 deletions configuration/quince.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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%