https://git.useribm.hu / mediacube.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 911a013)
git-tfs-id: [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube...
authorVásáry Dániel <daniel.vasary@userrendszerhaz.hu>
Tue, 17 Jul 2018 12:33:03 +0000 (12:33 +0000)
committerVásáry Dániel <daniel.vasary@userrendszerhaz.hu>
Tue, 17 Jul 2018 12:33:03 +0000 (12:33 +0000)
server/user.jobengine.osgi.server/pages/searchitems.zul patch | blob | history
server/user.jobengine.osgi.server/src/user/jobengine/zk/model/SearchModel.java patch | blob | history
server/user.jobengine.osgi.server/src/user/jobengine/zk/util/SessionUtil.java patch | blob | history

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