Skip to content

Linnea Samila / Moya

Go to a project
Commit 97cfd9b1 by Tuomas Riihimäki
Options

Enter did not work after adding buttons before search button in the form. Added … 

…extra hidden buttonat the very start of form
1 parent 8ad6963c
Inline Side-by-side
Showing with 23 additions and 23 deletions
code/moya-web/WebContent/useradmin/list.xhtml
...@@ -20,12 +20,14 @@ ...@@ -20,12 +20,14 @@
<h1>#{i18n['userlist.header']}</h1> <h1>#{i18n['userlist.header']}</h1>
<h:form id="pageform" styleClass="useradmin_list"> <h:form id="pageform" styleClass="useradmin_list">
<!-- This is here, so that pressing enter works correctly. -->
<p:commandButton style="display: none;" action="#{userSearchView.newSearch()}" ajax="false" />
<p:panelGrid style="width: 100%;"> <p:panelGrid style="width: 100%;">
<p:row> <p:row>
<p:column> <p:column>
<p:commandButton onclick="$('#advancedSearch').toggle(); return false;" value="#{i18n['userlist.showAdvancedSearch']}" ajax="false" /> <p:commandButton onclick="$('#advancedSearch').toggle(); return false;" value="#{i18n['userlist.showAdvancedSearch']}" ajax="false" />
<div id="advancedSearch" style="display: none;"> <div id="advancedSearch" style="display: none;">
<!-- <!--
...@@ -37,56 +39,54 @@ ...@@ -37,56 +39,54 @@
value="#{userSearchView.searchQuery.filterRoles}" converter="#{roleConverter}"> value="#{userSearchView.searchQuery.filterRoles}" converter="#{roleConverter}">
</h:inputText> </h:inputText>
--> -->
<p:selectManyCheckbox layout="pageDirection" styleClass="nowrap" id="rolefilter" value="#{userSearchView.searchQuery.filterRoles}" converter="#{roleConverter}"> <p:selectManyCheckbox layout="pageDirection" styleClass="nowrap" id="rolefilter" value="#{userSearchView.searchQuery.filterRoles}" converter="#{roleConverter}">
<f:selectItems value="#{roleDataView.roles}" var="r" itemLabel="#{r.name}" /> <f:selectItems value="#{roleDataView.roles}" var="r" itemLabel="#{r.name}" />
</p:selectManyCheckbox> </p:selectManyCheckbox>
<h3> <h3>
<h:outputText value="#{i18n['userlist.cardfilter']}" /> <h:outputText value="#{i18n['userlist.cardfilter']}" />
</h3> </h3>
<p:selectManyCheckbox id="cardstatusfilter" layout="pageDirection" styleClass="nowrap" value="#{userSearchView.searchQuery.hasCardState}" converter="#{cardStateConverter}"> <p:selectManyCheckbox id="cardstatusfilter" layout="pageDirection" styleClass="nowrap" value="#{userSearchView.searchQuery.hasCardState}" converter="#{cardStateConverter}">
<f:selectItems value="#{userSearchView.searchQuery.cardStates}" var="r" itemLabel="#{r}" /> <f:selectItems value="#{userSearchView.searchQuery.cardStates}" var="r" itemLabel="#{r}" />
</p:selectManyCheckbox> </p:selectManyCheckbox>
<h3> <h3>Muut</h3>
Muut
</h3>
<p:selectBooleanCheckbox id="placeassoc" value="#{userSearchView.searchQuery.placeAssoc}" /> <p:selectBooleanCheckbox id="placeassoc" value="#{userSearchView.searchQuery.placeAssoc}" />
<p:outputLabel for="placeassoc" value="#{i18n['userlist.placeassoc']}" /> <p:outputLabel for="placeassoc" value="#{i18n['userlist.placeassoc']}" />
<br /> <br />
<p:outputLabel for="saldofilter" value="#{i18n['userlist.saldofilter']}" /> <p:outputLabel for="saldofilter" value="#{i18n['userlist.saldofilter']}" />
<h:selectOneMenu id="saldofilter" value="#{userSearchView.searchQuery.accountSaldoCompare}"> <h:selectOneMenu id="saldofilter" value="#{userSearchView.searchQuery.accountSaldoCompare}">
<f:selectItems value="#{userSearchView.searchQuery.accountCompareValues}" /> <f:selectItems value="#{userSearchView.searchQuery.accountCompareValues}" />
</h:selectOneMenu> </h:selectOneMenu>
<p:inputText value="#{userSearchView.searchQuery.accountSaldo}"> <p:inputText value="#{userSearchView.searchQuery.accountSaldo}">
<f:convertNumber minFractionDigits="0" maxFractionDigits="2" /> <f:convertNumber minFractionDigits="0" maxFractionDigits="2" />
</p:inputText> </p:inputText>
<br /> <br />
<p:selectBooleanCheckbox id="onlythisevent" value="#{userSearchView.searchQuery.onlyThisEvent}" /> <p:selectBooleanCheckbox id="onlythisevent" value="#{userSearchView.searchQuery.onlyThisEvent}" />
<p:outputLabel for="onlythisevent" value="#{i18n['userlist.onlythisevent']}" /> <p:outputLabel for="onlythisevent" value="#{i18n['userlist.onlythisevent']}" />
<br /> <br />
<p:selectBooleanCheckbox id="userswithunusedcodes" value="#{userSearchView.searchQuery.usersWithUnusedCodes}" /> <p:selectBooleanCheckbox id="userswithunusedcodes" value="#{userSearchView.searchQuery.usersWithUnusedCodes}" />
<p:outputLabel for="userswithunusedcodes" value="#{i18n['userlist.usersWithUnusedCodes']}" /> <p:outputLabel for="userswithunusedcodes" value="#{i18n['userlist.usersWithUnusedCodes']}" />
</div> </div>
<br /> <br />
</p:column> </p:column>
<p:column> <p:column>
<!-- <a id="show_user_cart" style="display: #{((userCartView.isEmpty())?'block':'none')};" onclick="$('#pageform\\:usercart').slideToggle(300);"><h:outputText value="#{i18n['usercart.showCart']}" /></a> --> <!-- <a id="show_user_cart" style="display: #{((userCartView.isEmpty())?'block':'none')};" onclick="$('#pageform\\:usercart').slideToggle(300);"><h:outputText value="#{i18n['usercart.showCart']}" /></a> -->
<p:commandButton onclick="$('#pageform\\:usercart').toggle(); return false;" value="#{i18n['usercart.showCart']}" ajax="false" /> <p:commandButton onclick="$('#pageform\\:usercart').toggle(); return false;" value="#{i18n['usercart.showCart']}" ajax="false" />
<p:panelGrid columns="1" id="usercart" styleClass="noborderTable" style="display: #{((userCartView.isEmpty())?'none':'block')};"> <p:panelGrid columns="1" id="usercart" styleClass="noborderTable" style="display: #{((userCartView.isEmpty())?'none':'block')};">
<p:commandButton actionListener="#{userSearchView.addToCart}" value="#{i18n['usercart.addSearchedUsers']}" ajax="false" /> <p:commandButton actionListener="#{userSearchView.addToCart}" value="#{i18n['usercart.addSearchedUsers']}" ajax="false" />
<h:panelGroup> <h:panelGroup>
...@@ -101,9 +101,9 @@ ...@@ -101,9 +101,9 @@
<p:fileDownload value="#{userCartView.userExport}" /> <p:fileDownload value="#{userCartView.userExport}" />
</p:commandButton> </p:commandButton>
<p:commandButton action="#{userCartView.showOverview()}" value="#{i18n['usercart.showoverview']}" ajax="false" /> <p:commandButton action="#{userCartView.showOverview()}" value="#{i18n['usercart.showoverview']}" ajax="false" />
<p:commandButton rendered="#{creditTransferView.transferPermissions}" action="#{userCartView.transferCredits}" value="#{i18n['usercart.transferCredits']}" ajax="false" /> <p:commandButton rendered="#{creditTransferView.transferPermissions}" action="#{userCartView.transferCredits}" value="#{i18n['usercart.transferCredits']}" ajax="false" />
</p:panelGrid> </p:panelGrid>
</p:column> </p:column>
</p:row> </p:row>
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!