Merge branch 'alleventsearch' into 'master'

All event search fix

Fix searching from all events

See merge request !299

code/moya-web/WebContent/resources/cditools/user/list.xhtml

@@ -9,7 +9,7 @@
 <composite:implementation>
 <composite:implementation>
 	<h:outputScript library="primefaces" name="jquery/jquery.js" target="head" />
 	<h:outputScript library="primefaces" name="jquery/jquery.js" target="head" />
 
 
-	<p:dataTable id="user" value="#{userSearchView.userModel}" styleClass="moya_datatable4" rows="100" var="wra" paginator="true" lazy="true" sortBy="sentDate" sortOrder="descending">
+	<p:dataTable id="user" value="#{userSearchView.userModel}" styleClass="moya_datatable4" rows="100" var="wra" paginator="true" lazy="true">
 
 
 		<p:column sortBy="#{wra.user.nick}" headerText="#{i18n['user.nick']}">
 		<p:column sortBy="#{wra.user.nick}" headerText="#{i18n['user.nick']}">
 			<h:outputText value="#{(empty wra.user.nick)?'----':wra.user.nick}" />
 			<h:outputText value="#{(empty wra.user.nick)?'----':wra.user.nick}" />
@@ -39,43 +39,12 @@
 				<f:param name="userid" value="#{wra.user.id}" />
 				<f:param name="userid" value="#{wra.user.id}" />
 			</h:link>
 			</h:link>
 
 
-
-			<!-- 			<p:commandButton onClick="location.replace('#{request.contextPath}/useradmin/edit.jsf?userid=#{wra.user.id}')">#{i18n['user.edit']}</p:commandButton>
-   			<p:overlayPanel for="userinfoBtn">
-		<h:panelGrid columns="2">
-			<img style="width:100px;" src="#{request.contextPath}/dydata/userimage/#{wra.user.currentImage.id}.img" alt="image" />
-
-			<h:panelGroup>
-			<h:outputText value="#{wra.user.nick}"/> <br />
-			<h:outputText value="#{wra.user.firstnames} #{wra.user.lastname}"/> <br />
-			<hr />
-			<h:outputText value="#{wra.user.address}"/> <br />
-			<h:outputText value="#{wra.user.zip} #{wra.user.postalTown}"/> <br />
-			<br />
-			<h:outputText value="#{wra.user.phone}"/> <br />
-			<h:outputText value="#{wra.user.email}"/> <br />
-			</h:panelGroup>
-			</h:panelGrid>
-			</p:overlayPanel>
--->
 		</p:column>
 		</p:column>
 
 
-		<!-- <h:column>
-				<h:commandButton action="#{userView.shop()}" value="#{i18n['user.shop']}" />
-			</h:column> -->
+
 	</p:dataTable>
 	</p:dataTable>
 
 
 
 
-	<script>
- jQuery(function() {
-	jQuery(".hoverable").hover(function () {
-	    jQuery(this).next().fadeIn();
-	  }, 
-	  function () {
-		  jQuery(this).next().fadeOut();
-	  });
-	 });
-</script>
 </composite:implementation>
 </composite:implementation>
 
 
 </html>
 </html>

code/moya-web/WebContent/useradmin/list.xhtml

@@ -71,9 +71,9 @@
 						<h:commandButton value="#{i18n['userlist.search']}" action="#{userSearchView.newSearch()}" />
 						<h:commandButton value="#{i18n['userlist.search']}" action="#{userSearchView.newSearch()}" />
 					</h:panelGroup>
 					</h:panelGroup>
 					<h:panelGroup>
 					<h:panelGroup>
-						<a id="show_user_cart" 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:panelGrid columns="1" id="usercart" styleClass="noborderTable" style="display:none;">
+						<p:panelGrid columns="1" id="usercart" styleClass="noborderTable" style="display: #{((userCartView.isEmpty())?'none':'block')};">
 							<h:commandButton actionListener="#{userSearchView.addToCart}" value="#{i18n['usercart.addSearchedUsers']}" />
 							<h:commandButton actionListener="#{userSearchView.addToCart}" value="#{i18n['usercart.addSearchedUsers']}" />
 							<h:panelGroup>
 							<h:panelGroup>
 								<h:outputText value="#{i18n['usercart.cartsize']} #{userCartView.userCartSize}" />
 								<h:outputText value="#{i18n['usercart.cartsize']} #{userCartView.userCartSize}" />