diff --git a/backoffice/src/main/webapp/WEB-INF/templates/template.xhtml b/backoffice/src/main/webapp/WEB-INF/templates/template.xhtml index ccb73d838b29fcbab757696c7c542c4fc75dd0fb..0bd403f4163bb07b7ff12f0754d974cdf96aa180 100644 --- a/backoffice/src/main/webapp/WEB-INF/templates/template.xhtml +++ b/backoffice/src/main/webapp/WEB-INF/templates/template.xhtml @@ -27,19 +27,26 @@ width: 100%; box-sizing: border-box; } - - </style> - <title>BackOffice - feiknius</title> </h:head> <h:body> <header> <h1>BackOffice - feiknius</h1> + + <p:panelMenu rendered="#{session.getAttribute('user')!=null}"> + + </p:panelMenu> <p:commandButton value="Salir" action="#{userLoginView.logout()}" rendered="#{session.getAttribute('user')!=null}"/> + + <p:commandButton value="Listar Hechos" action="gestionhechos.xhtml?faces-redirect=true" + async="true"/> + + <p:commandButton value="Publicar Hechos" action="publicarcancelar.xhtml?faces-redirect=true" + async="true" rendered="#{session.getAttribute('role') == 'Submitter'}"/> </header> - <!-- Menús, headers y todo lo que vaya antes del contenido --> + <!-- Menús, headers y t0do lo que vaya antes del contenido --> <p:messages/> <ui:insert name="contenido"> Contenido por defecto para que no quede en blanco... diff --git a/backoffice/src/main/webapp/jsf/gestionhechos.xhtml b/backoffice/src/main/webapp/jsf/gestionhechos.xhtml index 41d6898e7595e38a82a9124c1adfd6f3717da141..1fb6395fe7ed8bb2cc51d723cb757185193e38a2 100644 --- a/backoffice/src/main/webapp/jsf/gestionhechos.xhtml +++ b/backoffice/src/main/webapp/jsf/gestionhechos.xhtml @@ -59,15 +59,6 @@ </p:dataTable> </h:form> - - - - - <h:form style="margin-top:10px;text-align: center" var="noticia" > - - <h:commandButton value="PUBLICAR/CANCELAR HECHO" action="publicarcancelar.xhtml?faces-redirect=true" - update="form" async="true" process="@this" visible="#{userLoginView.user.role.name.equals('SUBMITTER')}"/> - </h:form> </ui:define> </ui:decorate> </body> diff --git a/central-ejb/src/main/java/uy/edu/fing/tse/central/business/BusinessRemote.java b/central-ejb/src/main/java/uy/edu/fing/tse/central/business/BusinessRemote.java index 33b5bf8df50eb313a9ecd7de57ba13b3aca58436..a58314191b2b38c8a8c9b9c7f47f022b16e9077b 100644 --- a/central-ejb/src/main/java/uy/edu/fing/tse/central/business/BusinessRemote.java +++ b/central-ejb/src/main/java/uy/edu/fing/tse/central/business/BusinessRemote.java @@ -1,5 +1,7 @@ package uy.edu.fing.tse.central.business; -//@Remote +import javax.ejb.Remote; + +@Remote public interface BusinessRemote extends Business { } diff --git a/central-ejb/src/main/java/uy/edu/fing/tse/central/business/security/SecurityRemote.java b/central-ejb/src/main/java/uy/edu/fing/tse/central/business/security/SecurityRemote.java index b001861457f97323f99a7a7fbb6bd7240d13bd16..dbb76e26b9aa9976edbaa75914b7dcb81108b6db 100644 --- a/central-ejb/src/main/java/uy/edu/fing/tse/central/business/security/SecurityRemote.java +++ b/central-ejb/src/main/java/uy/edu/fing/tse/central/business/security/SecurityRemote.java @@ -1,5 +1,7 @@ package uy.edu.fing.tse.central.business.security; -//@Remote +import javax.ejb.Remote; + +@Remote public interface SecurityRemote extends Security { } diff --git a/central-ejb/src/main/java/uy/edu/fing/tse/central/business/startup/Config.java b/central-ejb/src/main/java/uy/edu/fing/tse/central/business/startup/Config.java index 58e0c4bed5bfb6b337146c028ff027c08508d713..d9fcbd16f215dfd4d6d996fd3b594a295ea67071 100644 --- a/central-ejb/src/main/java/uy/edu/fing/tse/central/business/startup/Config.java +++ b/central-ejb/src/main/java/uy/edu/fing/tse/central/business/startup/Config.java @@ -39,7 +39,7 @@ public class Config { negocio.altaRol(e); e = new Role(); - e.setName("Submiter"); + e.setName("Submitter"); negocio.altaRol(e); e = new Role(); @@ -67,10 +67,10 @@ public class Config { u = new UserBO(); - u.setPassword("submiter"); - u.setMail("submiter"); + u.setPassword("submitter"); + u.setMail("submitter"); e = new Role(); - e.setName("Submiter"); + e.setName("Submitter"); u.setRole(e); users.register(u); }