Skip to content

Codecrew / Moya

Go to a project
Commit b994f9a7 by Tuomas Riihimäki
Options

Merge branch 'pienifixi' into 'master' 

Pienifixi

jotain pientä vippilistaan

See merge request !296
2 parents 128799f7 846f1bca
Inline Side-by-side
Showing with 11 additions and 13 deletions
code/moya-web/WebContent/info/viplist.xhtml
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
<ui:define name="content"> <ui:define name="content">
<h:form id="vipform"> <h:form id="vipform">
<p:dataTable id="vip" value="#{vipListView.viplist}" widgetVar="viplist" styleClass="moya_datatable4" var="vip" filteredValue="#{vipListView.filteredVips}"> <p:dataTable id="vip" value="#{vipListView.viplist}" widgetVar="viplist" styleClass="moya_datatable4" var="vip" >
<!-- f:facet name="header"> <!-- f:facet name="header">
<p:outputPanel> <p:outputPanel>
<h:outputText value="Search all fields:" /> <h:outputText value="Search all fields:" />
...@@ -29,9 +29,8 @@ ...@@ -29,9 +29,8 @@
</p:column> </p:column>
<!-- p:column headerText="#{i18n['vip.description']}" filterBy="#{vip.description}" filterMatchMode="contains" --> <!-- p:column headerText="#{i18n['vip.description']}" filterBy="#{vip.description}" filterMatchMode="contains" -->
<p:column headerText="#{i18n['vip.description']}" style="width: 170px;"> <p:column headerText="#{i18n['vip.shortdescr']}" style="width: 170px;">
<h:outputText id="vipdescr" value="#{vip.shortDisplayDescr}" title="#{vip.description}" /> <h:outputText id="vipdescr" value="#{vip.shortDisplayDescr}" title="#{vip.description}" />
<p:tooltip id="toolTipVipdescr" for="vipdescr" value="#{vip.description}" />
</p:column> </p:column>
<p:column headerText="#{i18n['vip.description']}" > <p:column headerText="#{i18n['vip.description']}" >
......
code/moya-web/WebContent/vip/viplist.xhtml
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
<br /> <br />
<h:form id="vipform"> <h:form id="vipform">
<p:dataTable id="vipList" value="#{vipListView.viplist}" widgetVar="viplist" styleClass="moya_datatable4" var="vip" filteredValue="#{vipListView.filteredVips}"> <p:dataTable id="vipList" value="#{vipListView.viplist}" widgetVar="viplist" styleClass="moya_datatable4" var="vip" >
<!-- f:facet name="header"> <!-- f:facet name="header">
<p:outputPanel> <p:outputPanel>
<h:outputText value="Search all fields:" /> <h:outputText value="Search all fields:" />
...@@ -31,9 +31,8 @@ ...@@ -31,9 +31,8 @@
</p:column> </p:column>
<!-- p:column headerText="#{i18n['vip.description']}" filterBy="#{vip.description}" filterMatchMode="contains" --> <!-- p:column headerText="#{i18n['vip.description']}" filterBy="#{vip.description}" filterMatchMode="contains" -->
<p:column headerText="#{i18n['vip.description']}" style="width: 170px;"> <p:column headerText="#{i18n['vip.shortdescr']}" style="width: 170px;">
<h:outputText id="vipdescr" value="#{vip.shortDisplayDescr}" title="#{vip.description}" /> <h:outputText id="vipdescr" value="#{vip.shortDisplayDescr}" title="#{vip.description}" />
<p:tooltip id="toolTipVipdescr" for="vipdescr" value="#{vip.description}" />
</p:column> </p:column>
<p:column headerText="#{i18n['vip.description']}" > <p:column headerText="#{i18n['vip.description']}" >
......
code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/vip/VipListView.java
...@@ -84,7 +84,7 @@ public class VipListView extends PaginationView<Vip> { ...@@ -84,7 +84,7 @@ public class VipListView extends PaginationView<Vip> {
public void setViplist(ListDataModel<Vip> viplist) { public void setViplist(ListDataModel<Vip> viplist) {
this.viplist = viplist; this.viplist = viplist;
} }
/*
public List<Vip> getFilteredVips() { public List<Vip> getFilteredVips() {
return filteredVips; return filteredVips;
} }
...@@ -92,7 +92,7 @@ public class VipListView extends PaginationView<Vip> { ...@@ -92,7 +92,7 @@ public class VipListView extends PaginationView<Vip> {
public void setFilteredVips(List<Vip> filteredVips) { public void setFilteredVips(List<Vip> filteredVips) {
this.filteredVips = filteredVips; this.filteredVips = filteredVips;
} }
*/
public VipDeliverView getDeliverView() { public VipDeliverView getDeliverView() {
return deliverView; return deliverView;
} }
......
code/moya-web/src/main/resources/fi/codecrew/moya/resources/i18n.properties
...@@ -520,7 +520,7 @@ vip.backToList = Takaisin listaukseen ...@@ -520,7 +520,7 @@ vip.backToList = Takaisin listaukseen
vip.create = Luo vip.create = Luo
vip.createNew = Luo uusi vip.createNew = Luo uusi
vip.deliver = Toimita vip.deliver = Toimita
vip.description = Kuvaus vip.description = Lis\u00E4tietoja
vip.edit = Muokkaa vip.edit = Muokkaa
vip.host = Is\u00E4nt\u00E4 vip.host = Is\u00E4nt\u00E4
vip.hostsName = Is\u00E4nt\u00E4 vip.hostsName = Is\u00E4nt\u00E4
...@@ -528,7 +528,7 @@ vip.productDelivered = Toimitettu ...@@ -528,7 +528,7 @@ vip.productDelivered = Toimitettu
vip.productQuantity = Lkm vip.productQuantity = Lkm
vip.products = Tuote vip.products = Tuote
vip.save = Tallenna vip.save = Tallenna
vip.shortdescr = Lyhyt kuvaus vip.shortdescr = Nimi
vipProduct.create = Lis\u00E4\u00E4 vipProduct.create = Lis\u00E4\u00E4
vipProduct.deliver = Toimita vipProduct.deliver = Toimita
......
code/moya-web/src/main/resources/fi/codecrew/moya/resources/i18n_en.properties
...@@ -1726,7 +1726,7 @@ vip.productDelivered = Delivered ...@@ -1726,7 +1726,7 @@ vip.productDelivered = Delivered
vip.productQuantity = Qty vip.productQuantity = Qty
vip.products = Product vip.products = Product
vip.save = Save vip.save = Save
vip.shortdescr = Short description vip.shortdescr = Name
vipProduct.create = Create vipProduct.create = Create
vipProduct.deliver = Deliver vipProduct.deliver = Deliver
......
code/moya-web/src/main/resources/fi/codecrew/moya/resources/i18n_fi.properties
...@@ -1703,7 +1703,7 @@ vip.backToList = Takaisin listaukseen ...@@ -1703,7 +1703,7 @@ vip.backToList = Takaisin listaukseen
vip.create = Luo vip.create = Luo
vip.createNew = Luo uusi vip.createNew = Luo uusi
vip.deliver = Toimita vip.deliver = Toimita
vip.description = Kuvaus vip.description = Lis\u00E4tietoja
vip.edit = Muokkaa vip.edit = Muokkaa
vip.host = Is\u00E4nt\u00E4 vip.host = Is\u00E4nt\u00E4
vip.hostsName = Is\u00E4nt\u00E4 vip.hostsName = Is\u00E4nt\u00E4
...@@ -1711,7 +1711,7 @@ vip.productDelivered = Toimitettu ...@@ -1711,7 +1711,7 @@ vip.productDelivered = Toimitettu
vip.productQuantity = Lkm vip.productQuantity = Lkm
vip.products = Tuote vip.products = Tuote
vip.save = Tallenna vip.save = Tallenna
vip.shortdescr = Lyhyt kuvaus vip.shortdescr = Nimi
vipProduct.create = Lis\u00E4\u00E4 vipProduct.create = Lis\u00E4\u00E4
vipProduct.deliver = Toimita vipProduct.deliver = Toimita
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!