From: Vásáry Dániel <daniel.vasary@userrendszerhaz.hu>
Date: Tue, 17 Jul 2018 12:33:03 +0000 (+0000)
Subject: git-tfs-id: [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube... 
X-Git-Url: http://git.useribm.hu/?a=commitdiff_plain;h=e663dfb872e4a0fa4bdfbfa1870f22a985824006;p=mediacube.git

git-tfs-id: [tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube;C31183
---

diff --git a/server/user.jobengine.osgi.server/pages/searchitems.zul b/server/user.jobengine.osgi.server/pages/searchitems.zul
index 2479b2d7..f36c53f5 100644
--- a/server/user.jobengine.osgi.server/pages/searchitems.zul
+++ b/server/user.jobengine.osgi.server/pages/searchitems.zul
@@ -90,13 +90,15 @@
 							</hbox>
 						</vlayout>
 						<hbox width="100%" pack="center" align="left">
-							<combobox id="search" hflex="1" focus="true" model="@load(vm.searchHistory)" autodrop="true"
-								tooltiptext="GÃ©pelje be a keresendÅ kifejezÃ©st Ã©s nyomja meg az Enter-t." onSelect="@command('doSearch')" onOK="@command('doSearch')">
+							<combobox id="search" hflex="1" focus="true" model="@load(vm.searchHistory)" autodrop="true" buttonVisible="false"
+								tooltiptext="GÃ©pelje be a keresendÅ kifejezÃ©st Ã©s nyomja meg az Enter-t." onOK="@command('doSearch')">
 								<template name="model">
 									<comboitem label="${each}" />
 								</template>
 							</combobox>
-							<button hflex="min" image="/img/ic_search_black_18dp.png" onClick="@command('doSearch')" style="width:40px" />
+							<button hflex="min" image="/img/ic_search_black_18dp.png" onClick="@command('doSearch')" />
+<!-- 							<spinner inplace="true" value="50" width="50px"/> -->
+							<a onClick="@command('clearHistory')" style="font-size: 9px;">elÅzmÃ©nyek tÃ¶rlÃ©se</a>
 						</hbox>
 					</groupbox>
 					<popup id="sortOther">
@@ -140,7 +142,9 @@
 														<label style="font:20px Century Gothic; color:#008AC8;" value="@load(each.item.title)" />
 													</hlayout>
 													<html sclass="relevant">
+														
 														<![CDATA[ <div style='width: 90%'>${each.relevant}</div> ]]>
+														
 													</html>
 												</div>
 											</hlayout>
diff --git a/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/SearchModel.java b/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/SearchModel.java
index 49dfa98f..c5581765 100644
--- a/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/SearchModel.java
+++ b/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/SearchModel.java
@@ -39,6 +39,7 @@ import org.zkoss.zul.Grid;
 import org.zkoss.zul.Hlayout;
 import org.zkoss.zul.ListModelList;
 import org.zkoss.zul.Messagebox;
+import org.zkoss.zul.Paging;
 import org.zkoss.zul.Row;
 import org.zkoss.zul.Timer;
 import org.zkoss.zul.Window;
@@ -165,7 +166,8 @@ public class SearchModel extends AsyncBaseModel {
 	public void afterCompose(@ContextParam(ContextType.VIEW) Component view) {
 		Selectors.wireComponents(view, this, false);
 		Selectors.wireEventListeners(view, this);
-		itemsGrid.getPagingChild().setAutohide(false);
+		Paging paging = itemsGrid.getPagingChild();
+		paging.setAutohide(false);
 
 		for (Component child : itemsGrid.getColumns().getChildren()) {
 			Column column = (Column) child;
@@ -177,6 +179,13 @@ public class SearchModel extends AsyncBaseModel {
 			searchResult = new InitializedCachedListModel(mediaID, searchValue, new ArrayList<String>(), orderBy, orderAscending);
 	}
 
+	@Command
+	@NotifyChange("searchHistory")
+	public void clearHistory() {
+		setSearchHistory(new ListModelList<>());
+		SessionUtil.putUserSearchHistory(searchHistory);
+	}
+
 	@Command
 	public void copyMediaIdToClipboard() {
 		String port = (Executions.getCurrent().getServerPort() == 80) ? "" : (":" + Executions.getCurrent().getServerPort());
diff --git a/server/user.jobengine.osgi.server/src/user/jobengine/zk/util/SessionUtil.java b/server/user.jobengine.osgi.server/src/user/jobengine/zk/util/SessionUtil.java
index 94f07901..6b9ec0cb 100644
--- a/server/user.jobengine.osgi.server/src/user/jobengine/zk/util/SessionUtil.java
+++ b/server/user.jobengine.osgi.server/src/user/jobengine/zk/util/SessionUtil.java
@@ -18,6 +18,7 @@ import org.zkoss.zk.ui.Executions;
 import org.zkoss.zk.ui.Session;
 import org.zkoss.zk.ui.Sessions;
 
+import com.ibm.nosql.json.api.BasicDBList;
 import com.ibm.nosql.json.api.BasicDBObject;
 import com.ibm.nosql.json.api.QueryBuilder;
 
@@ -137,15 +138,15 @@ public class SessionUtil {
 
 	public static List<String> getUserSearchHistory() {
 		BasicDBObject userSettings = getUserSettings();
-		String[] history = (String[]) userSettings.get(SEARCH_HISTORY);
-		return (history == null) ? new ArrayList<>() : Arrays.asList(history);
+		BasicDBList history = (BasicDBList) userSettings.get(SEARCH_HISTORY);
+		return (history == null) ? new ArrayList<>() : Arrays.asList(history.toArray(new String[history.size()]));
 	}
 
 	static private BasicDBObject getUserSettings() {
 		BasicDBObject result = (BasicDBObject) getAttribute(USER_SETTINGS);
 		if (result == null) {
 			UserPrincipal userPrincipal = getUserPrincipal();
-			result = (BasicDBObject) NoSQLUtils.collection(USER_SETTINGS).findOne(QueryBuilder.start(USER_NAME).is(userPrincipal.getAccount()));
+			result = (BasicDBObject) NoSQLUtils.collection(USER_SETTINGS).findOne(QueryBuilder.start(USER_NAME).is(userPrincipal.getAccount()).get());
 			if (result == null)
 				result = new BasicDBObject(USER_NAME, userPrincipal.getAccount());
 		}
@@ -221,7 +222,9 @@ public class SessionUtil {
 
 	public static void putUserSearchHistory(List<String> searchHistory) {
 		BasicDBObject userSettings = getUserSettings();
-		userSettings.put(SEARCH_HISTORY, searchHistory.toArray(new String[searchHistory.size()]));
+		BasicDBList history = new BasicDBList();
+		history.addAll(searchHistory);
+		userSettings.put(SEARCH_HISTORY, history);
 		putUserSettings();
 	}
 
