DMC/scipro
7
0
Fork 0
Code Issues39 Pull Requests8 Actions Projects1 Releases Wiki Activity

2984 PO 1) Don't show rejection form again after rejecting a final thesis and then immediately uploading a new version

Browse Source
This commit is contained in:
Andreas Svanberg 2023-10-04 16:44:41 +02:00
parent c2c7551c39
commit f67eca8e87
2 changed files with 8 additions and 3 deletions
view/src/main/java/se/su/dsv/scipro/finalthesis
ApproveFinalThesisPanel.javaRejectFinalThesisPanel.java

5
view/src/main/java/se/su/dsv/scipro/finalthesis/ApproveFinalThesisPanel.java

@ -190,6 +190,11 @@ public class ApproveFinalThesisPanel extends GenericPanel<Project> {
protected void cancel() {
showRejectionPanel(false);
}
@Override
protected void onRejection() {
showRejectionPanel(false);
}
};
rejectFinalThesisPanel.setVisibilityAllowed(false);
final WebMarkupContainer rejectContainer = new WebMarkupContainer(REJECT_CONTAINER);

6
view/src/main/java/se/su/dsv/scipro/finalthesis/RejectFinalThesisPanel.java

@ -93,8 +93,7 @@ public class RejectFinalThesisPanel extends GenericPanel<Project> {
protected void cancel(){}
private void onCreate() {
finalThesisService.reject(getModelObject());
protected void onRejection() {
}
protected void onSubmit() {
@ -107,7 +106,8 @@ public class RejectFinalThesisPanel extends GenericPanel<Project> {
projectForumService.createThread(project.getObject(), user,
REJECTED_SUBJECT, contentArea.getInput(), uploads);
onCreate();
finalThesisService.reject(getModelObject());
onRejection();
setResponsePage(getPage());
}