From 2a289bf28dda94f3e285bc3380a58491b87f39c7 Mon Sep 17 00:00:00 2001 From: Michael Hackstein Date: Fri, 31 Jan 2014 18:17:25 +0100 Subject: [PATCH] Fixed a bug where the group-by list of the graphviewer has not been stored locally --- .../js/graphViewer/ui/arangoAdapterControls.js | 4 +--- .../frontend/js/graphViewer/ui/modalDialogHelper.js | 11 +++-------- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/js/apps/system/aardvark/frontend/js/graphViewer/ui/arangoAdapterControls.js b/js/apps/system/aardvark/frontend/js/graphViewer/ui/arangoAdapterControls.js index ef3b7a114d..75955acc53 100644 --- a/js/apps/system/aardvark/frontend/js/graphViewer/ui/arangoAdapterControls.js +++ b/js/apps/system/aardvark/frontend/js/graphViewer/ui/arangoAdapterControls.js @@ -135,9 +135,7 @@ function ArangoAdapterControls(list, adapter) { idprefix, [{ type: "extendable", id: "attribute", - objects: function() { - adapter.getPrioList(); - } + objects: adapter.getPrioList() }], function () { var list = $("input[id^=" + idprefix + "attribute_]"), prios = []; diff --git a/js/apps/system/aardvark/frontend/js/graphViewer/ui/modalDialogHelper.js b/js/apps/system/aardvark/frontend/js/graphViewer/ui/modalDialogHelper.js index a96d504d98..151c60a458 100644 --- a/js/apps/system/aardvark/frontend/js/graphViewer/ui/modalDialogHelper.js +++ b/js/apps/system/aardvark/frontend/js/graphViewer/ui/modalDialogHelper.js @@ -450,14 +450,9 @@ var modalDialogHelper = modalDialogHelper || {}; }; modalDialogHelper.createModalChangeDialog = function(title, idprefix, objects, callback) { - var table = modalDialogHelper.modalDivTemplate(title, "Change", idprefix, callback), - os; - if (_.isFunction(objects)) { - os = objects(); - } else { - os = objects; - } - _.each(os, function(o) { + var table = modalDialogHelper.modalDivTemplate(title, "Change", idprefix, callback); + console.log(objects); + _.each(objects, function(o) { insertModalRow(table, idprefix, o); }); $("#" + idprefix + "modal").modal('show');