The no active project page should use the panel in the settings package instead of the deprecated panel.
This commit is contained in:
parent
a5097387fb
commit
9ceea3ca60
@ -1,49 +1,50 @@
|
||||
package se.su.dsv.scipro.project.pages;
|
||||
|
||||
import org.apache.wicket.PageParameters;
|
||||
import org.apache.wicket.ajax.AjaxRequestTarget;
|
||||
import org.apache.wicket.ajax.markup.html.AjaxLink;
|
||||
import org.odlabs.wiquery.ui.dialog.Dialog;
|
||||
|
||||
import se.su.dsv.scipro.SciProSession;
|
||||
import se.su.dsv.scipro.basepanels.UserSettingsPanel;
|
||||
import se.su.dsv.scipro.data.dataobjects.Project;
|
||||
|
||||
public class NoActiveProjectPage extends ProjectPage {
|
||||
|
||||
private Dialog dialog;
|
||||
|
||||
public NoActiveProjectPage(PageParameters pp) {
|
||||
super(pp);
|
||||
|
||||
Project activeProject = SciProSession.get().getActiveProject();
|
||||
if(activeProject != null){
|
||||
setRedirect(true);
|
||||
setResponsePage(ProjectStartPage.class);
|
||||
}
|
||||
|
||||
dialog = new Dialog("dialog");
|
||||
dialog.setModal(true);
|
||||
//dialog.setAutoOpen(true);
|
||||
dialog.add(new UserSettingsPanel("dialogContent"));
|
||||
dialog.setWidth(500);
|
||||
dialog.setHeight(500);
|
||||
dialog.setTitle("User settings");
|
||||
add(dialog);
|
||||
|
||||
|
||||
|
||||
add(new AjaxLink<Void>("userSettingsLink"){
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
@Override
|
||||
public void onClick(AjaxRequestTarget target) {
|
||||
|
||||
|
||||
dialog.open(target);
|
||||
}
|
||||
});
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
package se.su.dsv.scipro.project.pages;
|
||||
|
||||
import org.apache.wicket.PageParameters;
|
||||
import org.apache.wicket.ajax.AjaxRequestTarget;
|
||||
import org.apache.wicket.ajax.markup.html.AjaxLink;
|
||||
import org.odlabs.wiquery.ui.dialog.Dialog;
|
||||
|
||||
import se.su.dsv.scipro.SciProSession;
|
||||
import se.su.dsv.scipro.settings.panels.UserSettingsPanel;
|
||||
import se.su.dsv.scipro.data.dataobjects.Project;
|
||||
|
||||
public class NoActiveProjectPage extends ProjectPage {
|
||||
|
||||
private static final long serialVersionUID = -451617340554952675L;
|
||||
private Dialog dialog;
|
||||
|
||||
public NoActiveProjectPage(PageParameters pp) {
|
||||
super(pp);
|
||||
|
||||
Project activeProject = SciProSession.get().getActiveProject();
|
||||
if(activeProject != null){
|
||||
setRedirect(true);
|
||||
setResponsePage(ProjectStartPage.class);
|
||||
}
|
||||
|
||||
dialog = new Dialog("dialog");
|
||||
dialog.setModal(true);
|
||||
//dialog.setAutoOpen(true);
|
||||
dialog.add(new UserSettingsPanel("dialogContent"));
|
||||
dialog.setWidth(500);
|
||||
dialog.setHeight(500);
|
||||
dialog.setTitle("User settings");
|
||||
add(dialog);
|
||||
|
||||
|
||||
|
||||
add(new AjaxLink<Void>("userSettingsLink"){
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
@Override
|
||||
public void onClick(AjaxRequestTarget target) {
|
||||
|
||||
|
||||
dialog.open(target);
|
||||
}
|
||||
});
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user