Mercurial > hg > ismi-richfaces
changeset 101:16cbff5deb09
nicer display of import merge.
author | casties |
---|---|
date | Tue, 01 Nov 2016 19:44:01 +0100 |
parents | e43d5179d47f |
children | db3e1bbfde03 |
files | src/main/webapp/merge/importMerge.xhtml |
diffstat | 1 files changed, 4 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/src/main/webapp/merge/importMerge.xhtml Mon Oct 31 18:32:15 2016 +0100 +++ b/src/main/webapp/merge/importMerge.xhtml Tue Nov 01 19:44:01 2016 +0100 @@ -90,6 +90,10 @@ <h:outputText value="#{Session.importMerge.firstEntity.getObjectClass()}" /> <h:outputText value="#{Session.importMerge.secondEntity.getObjectClass()}" /> + <h:outputText value="Own Value" /> + <h:outputText value="#{Session.importMerge.firstEntity.getOwnValue()}" /> + <h:outputText value="#{Session.importMerge.secondEntity.getOwnValue()}" /> + </h:panelGrid> <h:panelGrid columns="2" styleClass="createPanel"