From: Vásáry Dániel <daniel.vasary@userrendszerhaz.hu>
Date: Thu, 19 Jul 2018 14:38:47 +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=5d64e0a8ac7039c91a5cb821c349cdea66f667fe;p=mediacube.git

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

diff --git a/server/user.jobengine.osgi.server/pages/searchitems.zul b/server/user.jobengine.osgi.server/pages/searchitems.zul
index 736a85a7..8da04333 100644
--- a/server/user.jobengine.osgi.server/pages/searchitems.zul
+++ b/server/user.jobengine.osgi.server/pages/searchitems.zul
@@ -136,7 +136,7 @@
 							</columns>
 							<rows id="rows" style="cursor: pointer;">
 								<template name="model">
-									<row onClick="@command('selectMediaArchive', selectedObject=each)" onMouseOver="@Command('rowMouseOver', evt=event)"
+									<row onClick="@command('select', selectedObject=each)" onMouseOver="@Command('rowMouseOver', evt=event)"
 										onMouseOut="@Command('rowMouseOut', evt=event)" style="background: none;">
 										<detail open="@load(vm.rowsExpanded)">
 											<hlayout style="border-bottom: 1px solid #ebebeb; width: 100%;">
@@ -211,7 +211,7 @@
 											disabled="@load(not sessionScope.userPrincipal.editor or sessionScope.userPrincipal.anonymous or vm.selectedObject eq null)" label="Szerkesztés" />
 									</div>
 								</toolbar>
-								<div width="100%" vflex="true" style="padding: 4px; overflow:auto; background-color: white">
+								<div id="mediaDetails" width="100%" vflex="true" style="padding: 4px; overflow:auto; background-color: white">
 									<div>
 										<label style="font-size:8pt; color: gray" value="Anyag azonosító" />
 										<div style="margin: 4px">
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 2043af89..36579edd 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
@@ -35,6 +35,7 @@ import org.zkoss.zul.Checkbox;
 import org.zkoss.zul.Column;
 import org.zkoss.zul.Combobox;
 import org.zkoss.zul.Detail;
+import org.zkoss.zul.Div;
 import org.zkoss.zul.Grid;
 import org.zkoss.zul.Hlayout;
 import org.zkoss.zul.ListModelList;
@@ -95,6 +96,8 @@ public class SearchModel extends AsyncBaseModel {
 	Combobox search;
 	@Wire
 	Menupopup searchSettings;
+	@Wire
+	Div mediaDetails;
 
 	private String orderBy;
 	private boolean orderAscending;
@@ -216,12 +219,12 @@ public class SearchModel extends AsyncBaseModel {
 			searchResult = null;
 			itemsGrid.setActivePage(0);
 			searchValue = search.getText();
+			setSelectedObject(null);
 			if (StringUtils.isBlank(searchValue) || searchValue.length() < 3)
 				throw new Exception("Legalább 3 karakter megadása kötelező!");
 
 			List<String> searchFilters = getSelectedFilters();
 			searchResult = new CachedListModel(searchValue, searchFilters, orderBy, orderAscending);
-			setSelectedObject(null);
 
 			if (!searchHistory.contains(searchValue)) {
 				searchHistory.add(0, searchValue);
@@ -470,12 +473,14 @@ public class SearchModel extends AsyncBaseModel {
 
 	@Command
 	@NotifyChange({ "selectedObject", "hasLowresMediaFile", "hasTSMMediaFile", "lowresMediaFilePath" })
-	public void selectMediaArchive(@BindingParam("selectedObject") ArchivedMedia selectedObject, @ContextParam(ContextType.BIND_CONTEXT) BindContext ctx) {
+	public void select(@BindingParam("selectedObject") ArchivedMedia selectedObject, @ContextParam(ContextType.BIND_CONTEXT) BindContext ctx) {
 		Event event = ctx.getTriggerEvent();
 		selectedRowIndex = ((Row) event.getTarget()).getIndex();
 		highlight(this.selectedObject, false);
-		this.selectedObject = selectedObject;
+		setSelectedObject(selectedObject);
 		highlight(this.selectedObject, true);
+		Clients.scrollIntoView(mediaDetails.getFirstChild());
+
 		logger.info("Media was selected. Selected media archive:{}", selectedObject.getMedia().getId());
 	}
 
@@ -538,8 +543,10 @@ public class SearchModel extends AsyncBaseModel {
 
 	@NotifyChange({ "selectedObject", "hasLowresMediaFile", "hasTSMMediaFile", "lowresMediaFilePath" })
 	public void setSelectedObject(ArchivedMedia selectedObject) {
-		selectedObject.setMedia(itemManager.getMedia(selectedObject.getMedia().getId()));
-		selectedObject.setItem(itemManager.getItem(selectedObject.getMedia().getItemId()));
+		if (selectedObject != null) {
+			selectedObject.setMedia(itemManager.getMedia(selectedObject.getMedia().getId()));
+			selectedObject.setItem(itemManager.getItem(selectedObject.getMedia().getItemId()));
+		}
 		this.selectedObject = selectedObject;
 	}