From 1b53cc65b0d28112a65c6d3c32ed283f30f3d680 Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1s=C3=A1ry=20D=C3=A1niel?= Date: Fri, 13 Jul 2018 09:41:23 +0000 Subject: [PATCH] git-tfs-id: [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube;C31162 --- .../src/user/jobengine/zk/model/IndexModel.java | 17 ----------------- .../zk/model/MetadataDetailsModel.java | 5 ++++- 2 files changed, 4 insertions(+), 18 deletions(-) diff --git a/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/IndexModel.java b/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/IndexModel.java index 16b6aa3a..ff5d473c 100644 --- a/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/IndexModel.java +++ b/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/IndexModel.java @@ -89,23 +89,6 @@ public class IndexModel extends BaseModel { if (h == null) return; route(h.getString("action"), h.getString("query"), h.getBoolean("useQueryString")); - // JSONObject data = (JSONObject) evt.getData(); - // if (data != null) { - // JSONObject location = (JSONObject) data.get("location"); - // if (location != null) { - // String pathName = (String) location.get("pathname"); - // if (pathName != null) { - // Path path = Paths.get(pathName); - // Path action = path.getFileName(); - // if (action != null) { - // route(action.toString(), null); - // return; - // } - // } - // - // } - // } - // route(null, null); } public void pushClientHistory(String action, String query, boolean useQueryString) { diff --git a/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/MetadataDetailsModel.java b/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/MetadataDetailsModel.java index 96b454dd..1f8eadf8 100644 --- a/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/MetadataDetailsModel.java +++ b/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/MetadataDetailsModel.java @@ -28,13 +28,15 @@ public class MetadataDetailsModel extends BaseModel { private Window wnd; public ArchivedMedia archivedMedia; private List itemTypes; + private ItemManager manager; @AfterCompose public void afterCompose(@ContextParam(ContextType.VIEW) Component view) { Selectors.wireComponents(view, this, false); Selectors.wireEventListeners(view, this); archivedMedia = (ArchivedMedia) Executions.getCurrent().getArg().get("selectedObject"); - itemTypes = ItemManager.getInstance().getItemTypes(); + manager = ItemManager.getInstance(); + itemTypes = manager.getItemTypes(); ListIterator iterator = itemTypes.listIterator(); while (iterator.hasNext()) { ItemType itemType = iterator.next(); @@ -71,6 +73,7 @@ public class MetadataDetailsModel extends BaseModel { @Command public void save() { + manager.modify(archivedMedia.getMedia()); wnd.detach(); } -- 2.54.0