From 461120728d13dfd0e6e0a3992481ab542d30dc45 Mon Sep 17 00:00:00 2001
From: Emil Siverhall <emil-siv@dsv.su.se>
Date: Fri, 3 Aug 2012 10:30:40 +0200
Subject: [PATCH] removed duplicated feedback panels and some code cleanup
---
.../pages/SupervisorIdeaSubmissionPage.java | 4 +---
.../pages/SupervisorProjectIdeaStartPage.html | 1 -
.../pages/SupervisorProjectIdeaStartPage.java | 8 +-------
.../supervisor/panels/SupervisorEditIdeaPanel.java | 13 ++++---------
4 files changed, 6 insertions(+), 20 deletions(-)
diff --git a/src/main/java/se/su/dsv/scipro/supervisor/pages/SupervisorIdeaSubmissionPage.java b/src/main/java/se/su/dsv/scipro/supervisor/pages/SupervisorIdeaSubmissionPage.java
index 64d9b30dbf..734fd656ea 100644
--- a/src/main/java/se/su/dsv/scipro/supervisor/pages/SupervisorIdeaSubmissionPage.java
+++ b/src/main/java/se/su/dsv/scipro/supervisor/pages/SupervisorIdeaSubmissionPage.java
@@ -19,15 +19,13 @@ public class SupervisorIdeaSubmissionPage extends
super(pp);
Long ideaId = pp.getAsLong("idea");
SupervisorIdea idea;
-
- boolean readOnly = pp.getAsBoolean("readOnly");
if(ideaId!=null)
idea = ideaService.findOne(ideaId);
else {
idea = new SupervisorIdea();
}
- add(new SupervisorEditIdeaPanel("editPanel", getUser(), readOnly, new Model<SupervisorIdea>(idea)));
+ add(new SupervisorEditIdeaPanel("editPanel", getUser(), new Model<SupervisorIdea>(idea)));
}
diff --git a/src/main/java/se/su/dsv/scipro/supervisor/pages/SupervisorProjectIdeaStartPage.html b/src/main/java/se/su/dsv/scipro/supervisor/pages/SupervisorProjectIdeaStartPage.html
index fe380ba740..b15a094829 100644
--- a/src/main/java/se/su/dsv/scipro/supervisor/pages/SupervisorProjectIdeaStartPage.html
+++ b/src/main/java/se/su/dsv/scipro/supervisor/pages/SupervisorProjectIdeaStartPage.html
@@ -4,7 +4,6 @@
<body>
<wicket:extend>
<div class="span-24 last">
- <div wicket:id="feedback"></div>
<div wicket:id="availabilityPanel" class="append-bottom"></div>
<button wicket:id="ideaLink">Create new project idea</button>
<div class="prepend-top" wicket:id="ideaPanel"></div>
diff --git a/src/main/java/se/su/dsv/scipro/supervisor/pages/SupervisorProjectIdeaStartPage.java b/src/main/java/se/su/dsv/scipro/supervisor/pages/SupervisorProjectIdeaStartPage.java
index 5a6514f487..25ce76a4db 100644
--- a/src/main/java/se/su/dsv/scipro/supervisor/pages/SupervisorProjectIdeaStartPage.java
+++ b/src/main/java/se/su/dsv/scipro/supervisor/pages/SupervisorProjectIdeaStartPage.java
@@ -3,7 +3,6 @@ package se.su.dsv.scipro.supervisor.pages;
import org.apache.wicket.PageParameters;
import org.apache.wicket.markup.html.link.BookmarkablePageLink;
-import org.apache.wicket.markup.html.panel.FeedbackPanel;
import se.su.dsv.scipro.security.auth.Authorization;
import se.su.dsv.scipro.security.auth.roles.Roles;
@@ -13,12 +12,9 @@ import se.su.dsv.scipro.supervisor.panels.SupervisorProjectIdeaOverviewPanel;
@Authorization(authorizedRoles={Roles.SYSADMIN})
public class SupervisorProjectIdeaStartPage extends AbstractSupervisorProjectIdeaPage {
- private FeedbackPanel feedbackPanel;
public SupervisorProjectIdeaStartPage(PageParameters pp) {
super(pp);
- add(feedbackPanel = new FeedbackPanel("feedback"));
- feedbackPanel.setOutputMarkupId(true);
add(new SupervisorAvailabilityPanel("availabilityPanel", getUser()));
add(new SupervisorProjectIdeaOverviewPanel("ideaPanel", getUser()));
addSubmissionPageLink();
@@ -26,9 +22,7 @@ public class SupervisorProjectIdeaStartPage extends AbstractSupervisorProjectIde
}
private void addSubmissionPageLink() {
- PageParameters pp = new PageParameters();
- pp.put("readOnly", false);
- BookmarkablePageLink<Void> ideaLink = new BookmarkablePageLink<Void>("ideaLink", SupervisorIdeaSubmissionPage.class, pp);
+ BookmarkablePageLink<Void> ideaLink = new BookmarkablePageLink<Void>("ideaLink", SupervisorIdeaSubmissionPage.class);
add(ideaLink);
}
diff --git a/src/main/java/se/su/dsv/scipro/supervisor/panels/SupervisorEditIdeaPanel.java b/src/main/java/se/su/dsv/scipro/supervisor/panels/SupervisorEditIdeaPanel.java
index 0f1924f815..82a42898c8 100644
--- a/src/main/java/se/su/dsv/scipro/supervisor/panels/SupervisorEditIdeaPanel.java
+++ b/src/main/java/se/su/dsv/scipro/supervisor/panels/SupervisorEditIdeaPanel.java
@@ -58,9 +58,9 @@ public class SupervisorEditIdeaPanel extends Panel {
@SpringBean
private SupervisorService supervisorService;
- public SupervisorEditIdeaPanel(String id, User currentUser, boolean readOnly,IModel<SupervisorIdea> model) {
+ public SupervisorEditIdeaPanel(String id, User currentUser, IModel<SupervisorIdea> model) {
super(id, model);
- add(new IdeaForm("form", model, currentUser, readOnly).setEnabled(!readOnly));
+ add(new IdeaForm("form", model, currentUser));
}
private class IdeaForm extends Form<SupervisorIdea> {
@@ -76,7 +76,7 @@ public class SupervisorEditIdeaPanel extends Panel {
private KeywordContainer regularKwc;
private FeedbackPanel feedbackPanel;
- public IdeaForm(String id, final IModel<SupervisorIdea> model, final User currentUser, final boolean readOnly) {
+ public IdeaForm(String id, final IModel<SupervisorIdea> model, final User currentUser) {
super(id, model);
@@ -97,13 +97,8 @@ public class SupervisorEditIdeaPanel extends Panel {
descriptionField.add(StringValidator.minimumLength(10)); // Description needs to be at least 10 characters
final Employee ideaCreator = supervisorService.findByUser(currentUser);
- Employee ideaSupervisor = model.getObject().getCreator();
- Set<ResearchArea> areas;
- if(readOnly)
- areas = ideaSupervisor.getActiveResearchAreas();
- else
- areas = ideaCreator.getActiveResearchAreas();
+ Set<ResearchArea> areas = ideaCreator.getActiveResearchAreas();
ListView<ResearchArea> areaList = new ListView<ResearchArea>("researchAreas", new ArrayList<ResearchArea>(areas)) {
private static final long serialVersionUID = 1745649109195334927L;