När man sparar en template skickas man nu tillbaks till templateslistan

git-svn-id: svn://svn.dsv.su.se/scipro/scipro/trunk@544 73ecded7-942e-4092-bab0-0e58ef0ee984
This commit is contained in:
dan-kjel 2011-03-31 08:10:16 +00:00
parent eebbff4888
commit 4856b6faa2

@ -4,7 +4,6 @@ import java.util.Collections;
import java.util.List;
import org.apache.wicket.Component;
import org.apache.wicket.ajax.AjaxEventBehavior;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.markup.html.form.AjaxButton;
import org.apache.wicket.markup.html.WebMarkupContainer;
@ -26,13 +25,14 @@ import org.odlabs.wiquery.core.effects.EffectSpeed;
import org.odlabs.wiquery.ui.sortable.SortableAjaxBehavior;
import se.su.dsv.scipro.SciProSession;
import se.su.dsv.scipro.basepages.MenuPage;
import se.su.dsv.scipro.components.FormFeedbackPanel;
import se.su.dsv.scipro.data.dao.interfaces.ScheduleTemplateDao;
import se.su.dsv.scipro.data.dataobjects.ProjectEventTemplate;
import se.su.dsv.scipro.data.dataobjects.ProjectEventTemplate;
import se.su.dsv.scipro.data.dataobjects.ScheduleTemplate;
import se.su.dsv.scipro.icons.AjaxActionIcon;
import se.su.dsv.scipro.schedule.templates.pages.ScheduleTemplatesAdminPage;
import se.su.dsv.scipro.schedule.templates.pages.ScheduleTemplatesSupervisorPage;
import se.su.dsv.scipro.util.JavascriptEventConfirmation;
import se.su.dsv.scipro.util.WiQueryCoreEffectsHelper;
@ -53,8 +53,13 @@ public class ScheduleTemplateFormPanel extends Panel {
} else {
template = scheduleTemplateDao.reLoad(template);
}
add(new ScheduleTemplateForm("templateForm", template));
Class<? extends MenuPage> responseClass = null;
if(isSysAdminView){
responseClass = ScheduleTemplatesAdminPage.class;
} else {
responseClass = ScheduleTemplatesSupervisorPage.class;
}
add(new ScheduleTemplateForm("templateForm", template, responseClass));
}
class ScheduleTemplateForm extends Form<ScheduleTemplate> {
@ -68,7 +73,7 @@ public class ScheduleTemplateFormPanel extends Panel {
private Label totalEstimatedTimeLabel;
private Long totalEstimatedTime = (long) 0;
public ScheduleTemplateForm(String id, final ScheduleTemplate template) {
public ScheduleTemplateForm(String id, final ScheduleTemplate template, final Class<? extends MenuPage> responsePageClass) {
super(id, new CompoundPropertyModel<ScheduleTemplate>(template));
feedbackContainer = new WebMarkupContainer("feedbackContainer");
@ -260,9 +265,7 @@ public class ScheduleTemplateFormPanel extends Panel {
error("The template needs at least one event.");
} else {
st = scheduleTemplateDao.save(st);
ScheduleTemplateForm.this.setModelObject(st);
form.info("Template saved");
target.addComponent(feedbackContainer);
setResponsePage(responsePageClass);
}
}
@ -277,7 +280,7 @@ public class ScheduleTemplateFormPanel extends Panel {
@Override
protected void onSubmit(AjaxRequestTarget target, Form<?> form) {
setResponsePage(ScheduleTemplatesAdminPage.class);
setResponsePage(responsePageClass);
}
};