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

added stuff i forgot when refactoring project management gui

Browse Source
This commit is contained in:
Fredrik Friis 2012-03-20 18:48:52 +09:00
parent 812329d4e2
commit 6c8b64effb
3 changed files with 48 additions and 7 deletions
src/main/java/se/su/dsv/scipro
admin/panels
AdminEditProject.java
project/panels
ProjectManagementPanel.htmlProjectManagementPanel.java

6
src/main/java/se/su/dsv/scipro/admin/panels/AdminEditProject.java

@ -12,7 +12,6 @@ import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.PropertyModel;
import org.apache.wicket.spring.injection.annot.SpringBean;
import se.su.dsv.scipro.SciProSession;
import se.su.dsv.scipro.data.dao.interfaces.ProjectClassDao;
import se.su.dsv.scipro.data.dao.interfaces.ProjectDao;
import se.su.dsv.scipro.data.dataobjects.Employee;
@ -20,7 +19,6 @@ import se.su.dsv.scipro.data.dataobjects.Project;
import se.su.dsv.scipro.reusable.AddRemoveProjectFollowerPanel;
import se.su.dsv.scipro.reusable.AddRemoveStudentsPanel;
import se.su.dsv.scipro.reusable.EmployeeAutoComplete;
import se.su.dsv.scipro.security.auth.roles.Roles;
/**
* @author: fred-fri
@ -148,7 +146,5 @@ public abstract class AdminEditProject extends Panel {
}
}
private boolean isEditable(){
return SciProSession.get().authorizedForRole(Roles.SYSADMIN);
}
public abstract boolean isEditable();
}

2
src/main/java/se/su/dsv/scipro/project/panels/ProjectManagementPanel.html

@ -56,7 +56,7 @@
</tfoot>
<tbody wicket:id="dataview">
<tr>
<td wicket:id="projectTitle">Other role</td>
<td><a wicket:id="openLink"><span wicket:id="projectTitle">Other role</span></a></td>
<td wicket:id="projectLevel">Other role</td>
<td wicket:id="authorsLabel">Other role</td>
<td wicket:id="headsupervisorLabel">Other role</td>

47
src/main/java/se/su/dsv/scipro/project/panels/ProjectManagementPanel.java

@ -80,7 +80,38 @@ public class ProjectManagementPanel extends Panel {
@Override
protected void populateItem(Item<Project> item) {
final Project p = item.getModelObject();
item.add(new Label("projectTitle", p.getTitle()));
AjaxLink openLink = new AjaxLink<Void>("openLink") {
private static final long serialVersionUID = 1L;
@Override
public void onClick(AjaxRequestTarget target) {
dialog.replace(new AdminEditProject("panel", new Model<Project>(p)) {
private static final long serialVersionUID = -3929246545240675832L;
@Override
public void onUpdate(AjaxRequestTarget target) {
// dialog.close(target);
// ajaxRefresh(target);
// target.addComponent(dialog);
setResponsePage(ProjectManagementPage.class);
}
@Override
public boolean isEditable() {
return false;
}
});
dialog.setTitle("Project details");
target.addComponent(dialog);
dialog.open(target);
}
};
openLink.add(new Label("projectTitle", p.getTitle()));
item.add(openLink);
item.add(new Label("projectLevel", p.getProjectClass().toString()));
item.add(new Label("authorsLabel", p.getProjectParticipantsAsString()));
@ -111,6 +142,8 @@ public class ProjectManagementPanel extends Panel {
// });
dialog.replace(new AdminEditProject("panel", new Model<Project>(p)) {
private static final long serialVersionUID = -633068454448962134L;
@Override
public void onUpdate(AjaxRequestTarget target) {
// dialog.close(target);
@ -120,6 +153,11 @@ public class ProjectManagementPanel extends Panel {
setResponsePage(ProjectManagementPage.class);
}
@Override
public boolean isEditable() {
return SciProSession.get().authorizedForRole(Roles.SYSADMIN);
}
});
dialog.setTitle("Edit project");
target.addComponent(dialog);
@ -281,6 +319,8 @@ public class ProjectManagementPanel extends Panel {
// });
dialog.replace(new AdminEditProject("panel", new Model<Project>(new Project())) {
private static final long serialVersionUID = -9078483322668302904L;
@Override
public void onUpdate(AjaxRequestTarget target) {
@ -290,6 +330,11 @@ public class ProjectManagementPanel extends Panel {
setResponsePage(ProjectManagementPage.class);
}
@Override
public boolean isEditable() {
return SciProSession.get().authorizedForRole(Roles.SYSADMIN);
}
});
dialog.setTitle("Create new project");