DMC/scipro
7
0
Fork 0
Code Issues35 Pull Requests5 Actions Projects1 Releases Wiki Activity

Merge branch 'mytemp' into develop

Browse Source
This commit is contained in:
Fredrik Friis 2012-02-23 17:44:04 +09:00
commit 3643f94dd3
9 changed files with 35 additions and 34 deletions

2
src/main/java/se/su/dsv/scipro/admin/pages/AdminFinalSeminarPage.java

@ -9,7 +9,7 @@ import se.su.dsv.scipro.opponent.panels.OpponentListViewPanel;
import se.su.dsv.scipro.security.auth.Authorization;
import se.su.dsv.scipro.security.auth.roles.Roles;
@Authorization(authorizedRoles = { Roles.SYSADMIN,Roles.ADMIN})
@Authorization(authorizedRoles = { Roles.ADMIN})
public class AdminFinalSeminarPage extends AbstractAdminPage {

2
src/main/java/se/su/dsv/scipro/admin/pages/AdminPeerListPage.java

@ -6,7 +6,7 @@ import se.su.dsv.scipro.admin.panels.AdminPeerListPanel;
import se.su.dsv.scipro.security.auth.Authorization;
import se.su.dsv.scipro.security.auth.roles.Roles;
@Authorization(authorizedRoles = { Roles.SYSADMIN, Roles.ADMIN })
@Authorization(authorizedRoles = { Roles.ADMIN })
public class AdminPeerListPage extends AbstractAdminPage {

2
src/main/java/se/su/dsv/scipro/admin/pages/AdminProjectPartnerPage.java

@ -19,7 +19,7 @@ import se.su.dsv.scipro.security.auth.roles.Roles;
*
*/
@Authorization(authorizedRoles={Roles.SYSADMIN, Roles.ADMIN})
@Authorization(authorizedRoles = { Roles.ADMIN })
public class AdminProjectPartnerPage extends AbstractAdminPage {
@SpringBean

5
src/main/java/se/su/dsv/scipro/admin/pages/ProjectManagementPage.java

@ -6,12 +6,13 @@ import se.su.dsv.scipro.project.panels.ProjectManagementPanel;
import se.su.dsv.scipro.security.auth.Authorization;
import se.su.dsv.scipro.security.auth.roles.Roles;
@Authorization(authorizedRoles={Roles.SYSADMIN,Roles.ADMIN})
//@Authorization(authorizedRoles={Roles.SYSADMIN})
@Authorization(authorizedRoles = { Roles.ADMIN})
public class ProjectManagementPage extends AbstractAdminPage {
public ProjectManagementPage(PageParameters pp) {
super(pp);
add(new ProjectManagementPanel("pmp"));
}
}
}

3
src/main/java/se/su/dsv/scipro/admin/pages/match/AdminExemptionPage.java

@ -3,7 +3,10 @@ package se.su.dsv.scipro.admin.pages.match;
import org.apache.wicket.PageParameters;
import se.su.dsv.scipro.admin.pages.AbstractAdminMatchPage;
import se.su.dsv.scipro.security.auth.Authorization;
import se.su.dsv.scipro.security.auth.roles.Roles;
@Authorization(authorizedRoles={Roles.ADMIN})
public class AdminExemptionPage extends AbstractAdminMatchPage {
public AdminExemptionPage(PageParameters pp) {

4
src/main/java/se/su/dsv/scipro/admin/pages/match/AdminManageMatchSupervisorPage.java

@ -2,9 +2,13 @@ package se.su.dsv.scipro.admin.pages.match;
import org.apache.wicket.PageParameters;
import se.su.dsv.scipro.admin.pages.AbstractAdminMatchPage;
import se.su.dsv.scipro.match.panel.AdminManageSupervisorPanel;
import se.su.dsv.scipro.security.auth.Authorization;
import se.su.dsv.scipro.security.auth.roles.Roles;
@Authorization(authorizedRoles={Roles.ADMIN})
public class AdminManageMatchSupervisorPage extends AbstractAdminMatchPage {
public AdminManageMatchSupervisorPage(PageParameters pp) {

2
src/main/java/se/su/dsv/scipro/admin/pages/match/AdminManageProjectIdeaPage.java

@ -9,7 +9,7 @@ import se.su.dsv.scipro.match.panel.AdminWaitingProjectIdeaPanel;
import se.su.dsv.scipro.security.auth.Authorization;
import se.su.dsv.scipro.security.auth.roles.Roles;
@Authorization(authorizedRoles={Roles.SYSADMIN})
@Authorization(authorizedRoles={Roles.ADMIN})
public class AdminManageProjectIdeaPage extends AbstractAdminMatchPage {
public AdminManageProjectIdeaPage(PageParameters pp) {

38
src/main/java/se/su/dsv/scipro/project/panels/EditProjectPanel.java

@ -1,11 +1,6 @@
package se.su.dsv.scipro.project.panels;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Iterator;
import java.util.List;
import java.util.TreeSet;
import edu.emory.mathcs.backport.java.util.Collections;
import org.apache.wicket.Component;
import org.apache.wicket.Response;
import org.apache.wicket.ajax.AjaxRequestTarget;
@ -29,27 +24,20 @@ import org.wicketstuff.objectautocomplete.ObjectAutoCompleteBuilder;
import org.wicketstuff.objectautocomplete.ObjectAutoCompleteField;
import org.wicketstuff.objectautocomplete.ObjectAutoCompleteRenderer;
import org.wicketstuff.objectautocomplete.ObjectReadOnlyRenderer;
import se.su.dsv.scipro.SciProSession;
import se.su.dsv.scipro.admin.pages.ProjectContainer;
import se.su.dsv.scipro.components.autocomplete.AutoCompletionChoicesProvider;
import se.su.dsv.scipro.components.autocomplete.MultiObjectAutoCompleteBuilder;
import se.su.dsv.scipro.components.autocomplete.MultiObjectAutoCompleteField;
import se.su.dsv.scipro.components.autocomplete.MultiObjectAutoCompleteObjectConverter;
import se.su.dsv.scipro.components.autocomplete.MultiObjectAutoCompleteRenderer;
import se.su.dsv.scipro.components.autocomplete.TeamMemberMultiObjectAutoCompleteBuilder;
import se.su.dsv.scipro.components.autocomplete.TeamMemberMultiObjectAutoCompleteField;
import se.su.dsv.scipro.components.autocomplete.*;
import se.su.dsv.scipro.data.dao.interfaces.ProjectClassDao;
import se.su.dsv.scipro.data.dao.interfaces.ProjectDao;
import se.su.dsv.scipro.data.dao.interfaces.RoleDao;
import se.su.dsv.scipro.data.dataobjects.Employee;
import se.su.dsv.scipro.data.dataobjects.Project;
import se.su.dsv.scipro.data.dataobjects.ProjectClass;
import se.su.dsv.scipro.data.dataobjects.ProjectFollower;
import se.su.dsv.scipro.data.dataobjects.ProjectTeamMember;
import se.su.dsv.scipro.data.dataobjects.Student;
import se.su.dsv.scipro.data.dataobjects.User;
import se.su.dsv.scipro.data.dataobjects.*;
import se.su.dsv.scipro.data.facade.ProjectFacade;
import edu.emory.mathcs.backport.java.util.Collections;
import se.su.dsv.scipro.security.auth.roles.Roles;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import java.util.TreeSet;
//@Authorization(authorizedRoles={Roles.SYSADMIN,Roles.ADMIN})
public abstract class EditProjectPanel extends Panel {
@ -130,7 +118,9 @@ public abstract class EditProjectPanel extends Panel {
public ProjectCreationForm(String id, IModel<ProjectContainer> model) {
super(id,model);
boolean editEnabled = true;//Allow for confing this some way, preferrably via db-settings.
// boolean editEnabled = true;//Allow for confing this some way, preferrably via db-settings.
boolean editEnabled = SciProSession.get().authorizedForRole(Roles.SYSADMIN);
titleField = new RequiredTextField<String>("titleField",new PropertyModel<String>(projectModel,"title"));
titleField.add(new StringValidator.MaximumLengthValidator(200));
@ -165,7 +155,7 @@ public abstract class EditProjectPanel extends Panel {
submit();
onUpdate(target);
}
});
}.setVisible(SciProSession.get().authorizedForRole(Roles.SYSADMIN)));
}
public void submit(){

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

@ -1,8 +1,5 @@
package se.su.dsv.scipro.project.panels;
import java.util.HashSet;
import java.util.Set;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.markup.html.AjaxLink;
import org.apache.wicket.markup.html.WebMarkupContainer;
@ -15,7 +12,7 @@ import org.apache.wicket.markup.repeater.Item;
import org.apache.wicket.markup.repeater.data.DataView;
import org.apache.wicket.spring.injection.annot.SpringBean;
import org.odlabs.wiquery.ui.dialog.Dialog;
import se.su.dsv.scipro.SciProSession;
import se.su.dsv.scipro.admin.pages.ProjectManagementPage;
import se.su.dsv.scipro.data.dao.interfaces.Dao.SortableParams.Sort;
import se.su.dsv.scipro.data.dao.interfaces.ProjectDao;
@ -25,6 +22,10 @@ import se.su.dsv.scipro.reusable.DatesPanel;
import se.su.dsv.scipro.reusable.FilterProjectClassPanel;
import se.su.dsv.scipro.reusable.FilterProjectStatusPanel;
import se.su.dsv.scipro.reusable.FilterStringPanel;
import se.su.dsv.scipro.security.auth.roles.Roles;
import java.util.HashSet;
import java.util.Set;
public class ProjectManagementPanel extends Panel {
@ -127,6 +128,7 @@ public class ProjectManagementPanel extends Panel {
};
item.add(testLink);
}
@ -266,6 +268,7 @@ public class ProjectManagementPanel extends Panel {
}
};
add(newLink);
newLink.setVisible(SciProSession.get().authorizedForRole(Roles.SYSADMIN));
}
}