grogv3 / grog-cubi

Go to a project
Toggle navigation Toggle navigation pinning
Jean-Francois Leveque
1b11623c 1 parent 9f357f4c

https://tree.taiga.io/project/jr-utily-grog-v3/us/44 Implementer l'historisation pour les éditeurs 

https://tree.taiga.io/project/jr-utily-grog-v3/task/80 Minimalisation des namespaces de la page de liste
(partiel)
Inline Side-by-side
Showing 1 changed file with 13 additions and 19 deletions
...@@ -4,36 +4,24 @@ ...@@ -4,36 +4,24 @@
4 <html xmlns="http://www.w3.org/1999/xhtml" 4 <html xmlns="http://www.w3.org/1999/xhtml"
5 xmlns:h="http://xmlns.jcp.org/jsf/html" 5 xmlns:h="http://xmlns.jcp.org/jsf/html"
6 xmlns:jsf="http://xmlns.jcp.org/jsf" 6 xmlns:jsf="http://xmlns.jcp.org/jsf"
7 - xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
8 xmlns:f="http://xmlns.jcp.org/jsf/core"> 7 xmlns:f="http://xmlns.jcp.org/jsf/core">
9 <f:metadata> 8 <f:metadata>
10 <f:viewParam name="publisherId" value="#{listPublisherRevisionsView.publisherId}"/> 9 <f:viewParam name="publisherId" value="#{listPublisherRevisionsView.publisherId}"/>
11 <f:viewAction action="#{listPublisherRevisionsView.setView}"/> 10 <f:viewAction action="#{listPublisherRevisionsView.setView}"/>
12 </f:metadata> 11 </f:metadata>
13 -<h:body> 12 +<body>
14 - <h:form> 13 + <ul>
15 - <ul>
16 <li> 14 <li>
17 <a jsf:outcome="/index">Menu principal</a> 15 <a jsf:outcome="/index">Menu principal</a>
18 </li> 16 </li>
19 <li> 17 <li>
20 <a jsf:outcome="publisherRevision">Ajouter un éditeur</a> 18 <a jsf:outcome="publisherRevision">Ajouter un éditeur</a>
21 </li> 19 </li>
22 - </ul> 20 + </ul>
23 - </h:form>
24 21
25 - <h:link rendered="#{not listPublisherRevisionsView.viewAll}" outcome="listPublisherRevisions">Voir tous les éditeurs</h:link> 22 + <a jsf:outcome="listPublisherRevisions" jsf:rendered="#{not listPublisherRevisionsView.viewAll}">Voir tous les éditeurs</a>
26 - <ui:remove>
27 - <h:outputText rendered="#{not listPublisherRevisionsView.viewAll}">Révision valide #{listPublisherRevisionsView.publisherRevisions.get(0).publisher.validatedRevision.publisherRevisionId}</h:outputText>
28 - </ui:remove>
29 <h:outputText rendered="#{listPublisherRevisionsView.publisherRevisions.isEmpty()}">Liste des révisions est vide</h:outputText> 23 <h:outputText rendered="#{listPublisherRevisionsView.publisherRevisions.isEmpty()}">Liste des révisions est vide</h:outputText>
30 <h:dataTable value="#{listPublisherRevisionsView.publisherRevisions}" var="revision"> 24 <h:dataTable value="#{listPublisherRevisionsView.publisherRevisions}" var="revision">
31 - <ui:remove>
32 - <h:column>
33 - <f:facet name="header">Id</f:facet>
34 - #{revision.publisherRevisionId}
35 - </h:column>
36 - </ui:remove>
37 <h:column> 25 <h:column>
38 <f:facet name="header">Visualiser ou Modifier</f:facet> 26 <f:facet name="header">Visualiser ou Modifier</f:facet>
39 <h:link outcome="view">Visualiser ou Modifier Version 27 <h:link outcome="view">Visualiser ou Modifier Version
...@@ -99,11 +87,17 @@ ...@@ -99,11 +87,17 @@
99 #{revision.publisherRevisionDatetime} 87 #{revision.publisherRevisionDatetime}
100 </h:column> 88 </h:column>
101 <h:column> 89 <h:column>
102 - <f:facet name="header"></f:facet> 90 + <f:facet name="header">Validation author</f:facet>
91 + <h:outputText rendered="#{revision.publisherRevisionId == revision.publisher.validatedRevision.publisherRevisionId}">
92 + #{revision.publisher.validator.displayName}
93 + </h:outputText>
103 </h:column> 94 </h:column>
104 <h:column> 95 <h:column>
105 - <f:facet name="header"></f:facet> 96 + <f:facet name="header">Validation Datetime</f:facet>
97 + <h:outputText rendered="#{revision.publisherRevisionId == revision.publisher.validatedRevision.publisherRevisionId}">
98 + #{revision.publisher.validationDateTime}
99 + </h:outputText>
106 </h:column> 100 </h:column>
107 </h:dataTable> 101 </h:dataTable>
108 -</h:body> 102 +</body>
109 </html> 103 </html>
......