Browse Source

Merge origin/master

master
oscar 6 months ago
parent
commit
7ca0cb5a09
  1. 11
      ProyectoInventario-war/web/marcaLista.xhtml
  2. 2
      ProyectoInventario-war/web/usuariosLista.xhtml

11
ProyectoInventario-war/web/marcaLista.xhtml

@ -19,7 +19,7 @@
<f:metadata>
<f:viewParam name="rol" value="#{demoBeanLogin.rol}" />
<f:event type="preRenderView" listener="#{demoBeanLogin.verificarAcceso('admin,gestor')}" />
<f:event type="preRenderView" listener="#{demoBeanLogin.verificarAcceso('admin,almacenista')}" />
</f:metadata>
<div>
@ -90,7 +90,8 @@
<div style="flex: 1;">
<p:commandButton style="margin-top: 5px;" actionListener="#{demoBeanMarca.prepararNuevo()}" oncomplete="PF('mar').show()"
value="Nuevo" update=":dialogForm"
icon="pi pi-plus" ajax="true"/>
icon="pi pi-plus" ajax="true"
disabled="#{demoBeanLogin.permisos}"/>
</div>
<div style="flex: 1; text-align: center;">
@ -131,10 +132,12 @@
</f:facet>
<div style="text-align: center;">
<p:commandButton actionListener="#{demoBeanMarca.rellenarEditar(item)}" oncomplete="PF('mar').show()" update=":dialogForm" icon="pi pi-fw pi-pencil" styleClass="ui-button-secondary" ajax="true"/>
<p:commandButton actionListener="#{demoBeanMarca.rellenarEditar(item)}" oncomplete="PF('mar').show()" update=":dialogForm" icon="pi pi-fw pi-pencil"
styleClass="ui-button-secondary" ajax="true"
disabled="#{demoBeanLogin.permisos}"/>
<p:commandButton actionListener="#{demoBeanMarca.prepararEliminar(item)}" icon="pi pi-trash" style="margin-left: 5px" styleClass="ui-button-danger"
oncomplete="PF('dialogD').show()" update=":dialogDel"
ajax="true"/>
ajax="true" disabled="#{demoBeanLogin.permisos}"/>
</div>
</p:column>

2
ProyectoInventario-war/web/usuariosLista.xhtml

@ -19,7 +19,7 @@
<f:metadata>
<f:viewParam name="rol" value="#{demoBeanLogin.rol}" />
<f:event type="preRenderView" listener="#{demoBeanLogin.verificarAcceso('admin,gestor')}" />
<f:event type="preRenderView" listener="#{demoBeanLogin.verificarAcceso('admin')}" />
</f:metadata>
<div>
<h:form>

Loading…
Cancel
Save