From 636e595754ca4d70c845eaaf79057dfa3ad3c1d7 Mon Sep 17 00:00:00 2001
From: juanf <juanf>
Date: Tue, 5 Jul 2016 09:25:29 +0000
Subject: [PATCH] SSDM-3411 : ELN : Side Menu loading on demand, bugfix +
custom icons
SVN: 36789
---
.../html/js/views/SideMenu/SideMenuWidgetController.js | 6 +++++-
.../eln-lims/html/js/views/SideMenu/SideMenuWidgetView.js | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SideMenu/SideMenuWidgetController.js b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SideMenu/SideMenuWidgetController.js
index 134ffd46b32..b4baa2a92f5 100644
--- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SideMenu/SideMenuWidgetController.js
+++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SideMenu/SideMenuWidgetController.js
@@ -110,7 +110,11 @@ function SideMenuWidgetController(mainController) {
this._showNodeView = function(node) {
if(node.data.view) {
- mainController.changeView(node.data.view, node.data.viewData);
+ var viewData = node.data.viewData;
+ if(!viewData) {
+ viewData = null;
+ }
+ mainController.changeView(node.data.view, viewData);
this._sideMenuWidgetModel.selectedNodeData = {
key : node.key,
view : node.data.view,
diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SideMenu/SideMenuWidgetView.js b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SideMenu/SideMenuWidgetView.js
index 25bb71a80c8..58b7d241213 100644
--- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SideMenu/SideMenuWidgetView.js
+++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SideMenu/SideMenuWidgetView.js
@@ -257,7 +257,7 @@ function SideMenuWidgetView(sideMenuWidgetController, sideMenuWidgetModel) {
}
treeModel.push({ title : "Utilities", entityType: "UTILITIES", key : "UTILITIES", folder : true, lazy : false, children : treeModelUtils });
- treeModel.push({ title : "About", entityType: "ABOUT", key : "ABOUT", folder : false, lazy : false, view : "showAbout" });
+ treeModel.push({ title : "About", entityType: "ABOUT", key : "ABOUT", folder : false, lazy : false, view : "showAbout", icon : "glyphicon glyphicon-info-sign" });
var glyph_opts = {
map: {
--
GitLab