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

Merge branch 'sysadminAnno' into develop

Browse Source
This commit is contained in:
Emil Siverhall 2013-02-01 06:40:27 +01:00
commit c322c11c1e
7 changed files with 12 additions and 4 deletions

2
src/main/java/se/su/dsv/scipro/project/pages/ProjectAllSupervisorIdeasPage.java

@ -7,7 +7,7 @@ import se.su.dsv.scipro.project.panels.ProjectIdeaOverviewPanel;
import se.su.dsv.scipro.security.auth.Authorization;
import se.su.dsv.scipro.security.auth.roles.Roles;
@Authorization(authorizedRoles={Roles.STUDENT})
@Authorization(authorizedRoles={Roles.SYSADMIN})
public class ProjectAllSupervisorIdeasPage extends AbstractProjectIdeaPage {
private FeedbackPanel feedbackPanel;

2
src/main/java/se/su/dsv/scipro/project/pages/ProjectIdeaStartPage.java

@ -18,7 +18,7 @@ import se.su.dsv.scipro.security.auth.roles.Roles;
import se.su.dsv.scipro.springdata.services.StudentService;
import se.su.dsv.scipro.springdata.services.SupervisorIdeaService;
@Authorization(authorizedRoles={Roles.STUDENT})
@Authorization(authorizedRoles={Roles.SYSADMIN})
public class ProjectIdeaStartPage extends AbstractProjectIdeaPage implements MenuHighlightProjectIdeas{
@SpringBean

2
src/main/java/se/su/dsv/scipro/project/pages/ProjectIdeaSubmissionPage.java

@ -18,7 +18,7 @@ import se.su.dsv.scipro.project.panels.ProjectIdeaSubmissionPanel;
import se.su.dsv.scipro.security.auth.Authorization;
import se.su.dsv.scipro.security.auth.roles.Roles;
@Authorization(authorizedRoles={Roles.STUDENT})
@Authorization(authorizedRoles={Roles.SYSADMIN})
public class ProjectIdeaSubmissionPage extends AbstractProjectIdeaPage implements MenuHighlightProjectIdeas {
@SpringBean

2
src/main/java/se/su/dsv/scipro/supervisor/pages/SupervisorAllStudentIdeasPage.java

@ -40,7 +40,7 @@ import se.su.dsv.scipro.springdata.services.ProjectClassService;
import se.su.dsv.scipro.springdata.services.ProjectIdeaService;
import se.su.dsv.scipro.supervisor.panels.WatsonInfoPanel;
@Authorization(authorizedRoles = {Roles.EMPLOYEE})
@Authorization(authorizedRoles = {Roles.SYSADMIN})
public class SupervisorAllStudentIdeasPage extends AbstractSupervisorProjectIdeaPage implements MenuHighlightSupervisorProjectIdea {
@SpringBean

3
src/main/java/se/su/dsv/scipro/supervisor/pages/SupervisorAllSupervisorIdeasPage.java

@ -5,9 +5,12 @@ import org.apache.wicket.markup.html.link.BookmarkablePageLink;
import org.apache.wicket.spring.injection.annot.SpringBean;
import se.su.dsv.scipro.components.menuhighlighting.MenuHighlightSupervisorProjectIdea;
import se.su.dsv.scipro.security.auth.Authorization;
import se.su.dsv.scipro.security.auth.roles.Roles;
import se.su.dsv.scipro.springdata.services.SupervisorIdeaService;
import se.su.dsv.scipro.supervisor.panels.SupervisorAllProjectIdeaPanel;
@Authorization(authorizedRoles={Roles.SYSADMIN})
public class SupervisorAllSupervisorIdeasPage extends
AbstractSupervisorProjectIdeaPage implements MenuHighlightSupervisorProjectIdea{

3
src/main/java/se/su/dsv/scipro/supervisor/pages/SupervisorIdeaSubmissionPage.java

@ -7,9 +7,12 @@ import org.apache.wicket.spring.injection.annot.SpringBean;
import se.su.dsv.scipro.components.menuhighlighting.MenuHighlightSupervisorProjectIdea;
import se.su.dsv.scipro.match.dataobject.SupervisorIdea;
import se.su.dsv.scipro.security.auth.Authorization;
import se.su.dsv.scipro.security.auth.roles.Roles;
import se.su.dsv.scipro.springdata.services.SupervisorIdeaService;
import se.su.dsv.scipro.supervisor.panels.SupervisorEditIdeaPanel;
@Authorization(authorizedRoles={Roles.SYSADMIN})
public class SupervisorIdeaSubmissionPage extends
AbstractSupervisorProjectIdeaPage implements MenuHighlightSupervisorProjectIdea{

2
src/main/java/se/su/dsv/scipro/supervisor/pages/SupervisorProjectIdeaStartPage.java

@ -9,10 +9,12 @@ import se.su.dsv.scipro.match.panel.ApplicationPeriodInfoPanel;
import se.su.dsv.scipro.match.panel.IdeaInfoPanel;
import se.su.dsv.scipro.match.panel.SupervisorMyStudentIdeasPanel;
import se.su.dsv.scipro.reusable.LanguageLevelInfoPanel;
import se.su.dsv.scipro.security.auth.Authorization;
import se.su.dsv.scipro.security.auth.roles.Roles;
import se.su.dsv.scipro.supervisor.panels.SupervisorAvailabilityPanel;
import se.su.dsv.scipro.supervisor.panels.SupervisorMySupervisorIdeasPanel;
@Authorization(authorizedRoles={Roles.SYSADMIN})
public class SupervisorProjectIdeaStartPage extends AbstractSupervisorProjectIdeaPage {
public SupervisorProjectIdeaStartPage(PageParameters pp) {