Skip to content
Snippets Groups Projects
Commit fa1eca60 authored by vkovtun's avatar vkovtun
Browse files

SSDM-8405 Renamed export node with its subnodes.

parent b902ac95
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/ResearchCollectionExport/ResearchCollectionExportView.js
+ 1
− 1
View file @ fa1eca60
...@@ -50,7 +50,7 @@ function ResearchCollectionExportView(researchCollectionExportController, resear ...@@ -50,7 +50,7 @@ function ResearchCollectionExportView(researchCollectionExportController, resear
var $formTitle = $('<h2>').append('Research Collection Export Builder'); var $formTitle = $('<h2>').append('Research Collection Export Builder');
$header.append($formTitle); $header.append($formTitle);
var $exportButton = $('<input>', { 'type': 'submit', 'class': 'btn btn-primary', 'value': 'Export Selected', var $exportButton = $('<input>', {'type': 'submit', 'class': 'btn btn-primary', 'value': 'Export Selected',
'onClick': '$("form[name=\'rcExportForm\']").submit()'}); 'onClick': '$("form[name=\'rcExportForm\']").submit()'});
$header.append($exportButton); $header.append($exportButton);
}; };
......
openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SideMenu/SideMenuWidgetView.js
+ 40
− 40
View file @ fa1eca60
...@@ -269,32 +269,32 @@ function SideMenuWidgetView(sideMenuWidgetController, sideMenuWidgetModel) { ...@@ -269,32 +269,32 @@ function SideMenuWidgetView(sideMenuWidgetController, sideMenuWidgetModel) {
var treeModelExports = []; var treeModelExports = [];
if (profile.mainMenu.showExports) { if (profile.mainMenu.showExports) {
var exportBuilderLink = _this.getLinkForNode("Export Builder", "EXPORT_BUILDER", "showExportTreePage", null); var exportBuilderLink = _this.getLinkForNode("Export to ZIP", "EXPORT_TO_ZIP", "showExportTreePage", null);
treeModelExports.push({ treeModelExports.push({
displayName: "Export Builder", title: exportBuilderLink, entityType: "EXPORT_BUILDER", key: "EXPORT_BUILDER", displayName: "Export to ZIP", title: exportBuilderLink, entityType: "EXPORT_TO_ZIP", key: "EXPORT_TO_ZIP",
folder: false, lazy: false, view: "showExportTreePage", icon: "glyphicon glyphicon-export" folder: false, lazy: false, view: "showExportTreePage", icon: "glyphicon glyphicon-export"
}); });
} }
if (profile.mainMenu.showResearchCollectionExportBuilder) { if (profile.mainMenu.showResearchCollectionExportBuilder) {
var researchCollectionExportBuilderLink = _this.getLinkForNode("Research Collection Export Builder", var researchCollectionExportBuilderLink = _this.getLinkForNode("Export to Research Collection",
"RESEARCH_COLLECTION_EXPORT_BUILDER", "showResearchCollectionExportPage", null); "EXPORT_TO_RESEARCH_COLLECTION", "showResearchCollectionExportPage", null);
treeModelExports.push({ treeModelExports.push({
displayName: "Research Collection Export Builder", title: researchCollectionExportBuilderLink, displayName: "Export to Research Collection", title: researchCollectionExportBuilderLink,
entityType: "RESEARCH_COLLECTION_EXPORT_BUILDER", key: "RESEARCH_COLLECTION_EXPORT_BUILDER", folder: false, lazy: false, entityType: "EXPORT_TO_RESEARCH_COLLECTION", key: "EXPORT_TO_RESEARCH_COLLECTION", folder: false, lazy: false,
view: "showResearchCollectionExportPage", icon: "./img/research-collection-icon.png" view: "showResearchCollectionExportPage", icon: "./img/research-collection-icon.png"
}); });
} }
if (profile.mainMenu.showZenodoExportBuilder) { if (profile.mainMenu.showZenodoExportBuilder) {
var zenodoExportBuilderLink = _this.getLinkForNode("Zenodo Export Builder", "ZENODO_EXPORT_BUILDER", "showZenodoExportPage", null); var zenodoExportBuilderLink = _this.getLinkForNode("Export to Zenodo", "EXPORT_TO_ZENODO", "showZenodoExportPage", null);
treeModelExports.push({ treeModelExports.push({
displayName: "Zenodo Export Builder", title: zenodoExportBuilderLink, entityType: "ZENODO_EXPORT_BUILDER", displayName: "Export to Zenodo", title: zenodoExportBuilderLink, entityType: "EXPORT_TO_ZENODO",
key: "ZENODO_EXPORT_BUILDER", folder: false, lazy: false, view: "showZenodoExportPage", icon: "glyphicon glyphicon-export" key: "EXPORT_TO_ZENODO", folder: false, lazy: false, view: "showZenodoExportPage", icon: "glyphicon glyphicon-export"
}); });
} }
treeModelUtils.push({ displayName: "Export", title: "Export", entityType: "EXPORT", key: "EXPORT", folder: true, lazy: false, treeModelUtils.push({ displayName: "Exports", title: "Exports", entityType: "EXPORTS", key: "EXPORTS", folder: true, lazy: false,
expanded: false, children: treeModelExports, icon: "glyphicon glyphicon-export" }); expanded: false, children: treeModelExports, icon: "glyphicon glyphicon-export" });
} }
...@@ -322,22 +322,22 @@ function SideMenuWidgetView(sideMenuWidgetController, sideMenuWidgetModel) { ...@@ -322,22 +322,22 @@ function SideMenuWidgetView(sideMenuWidgetController, sideMenuWidgetModel) {
treeModel.push({ displayName: "About", title : "About", entityType: "ABOUT", key : "ABOUT", folder : false, lazy : false, view : "showAbout", icon : "glyphicon glyphicon-info-sign" }); treeModel.push({ displayName: "About", title : "About", entityType: "ABOUT", key : "ABOUT", folder : false, lazy : false, view : "showAbout", icon : "glyphicon glyphicon-info-sign" });
var glyph_opts = { var glyph_opts = {
map: { map: {
doc: "glyphicon glyphicon-file", doc: "glyphicon glyphicon-file",
docOpen: "glyphicon glyphicon-file", docOpen: "glyphicon glyphicon-file",
checkbox: "glyphicon glyphicon-unchecked", checkbox: "glyphicon glyphicon-unchecked",
checkboxSelected: "glyphicon glyphicon-check", checkboxSelected: "glyphicon glyphicon-check",
checkboxUnknown: "glyphicon glyphicon-share", checkboxUnknown: "glyphicon glyphicon-share",
dragHelper: "glyphicon glyphicon-play", dragHelper: "glyphicon glyphicon-play",
dropMarker: "glyphicon glyphicon-arrow-right", dropMarker: "glyphicon glyphicon-arrow-right",
error: "glyphicon glyphicon-warning-sign", error: "glyphicon glyphicon-warning-sign",
expanderClosed: "glyphicon glyphicon-plus-sign", expanderClosed: "glyphicon glyphicon-plus-sign",
expanderLazy: "glyphicon glyphicon-plus-sign", // glyphicon-expand expanderLazy: "glyphicon glyphicon-plus-sign", // glyphicon-expand
expanderOpen: "glyphicon glyphicon-minus-sign", // glyphicon-collapse-down expanderOpen: "glyphicon glyphicon-minus-sign", // glyphicon-collapse-down
folder: "glyphicon glyphicon-folder-close", folder: "glyphicon glyphicon-folder-close",
folderOpen: "glyphicon glyphicon-folder-open", folderOpen: "glyphicon glyphicon-folder-open",
loading: "glyphicon glyphicon-refresh" loading: "glyphicon glyphicon-refresh"
} }
}; };
var onLazyLoad = function(event, data) { var onLazyLoad = function(event, data) {
...@@ -400,7 +400,7 @@ function SideMenuWidgetView(sideMenuWidgetController, sideMenuWidgetModel) { ...@@ -400,7 +400,7 @@ function SideMenuWidgetView(sideMenuWidgetController, sideMenuWidgetModel) {
}); });
}); });
}); });
} };
switch(type) { switch(type) {
case "LAB_NOTEBOOK": case "LAB_NOTEBOOK":
...@@ -680,24 +680,24 @@ function SideMenuWidgetView(sideMenuWidgetController, sideMenuWidgetModel) { ...@@ -680,24 +680,24 @@ function SideMenuWidgetView(sideMenuWidgetController, sideMenuWidgetModel) {
}); });
} }
} };
var getCancelResultsFunction = function(dfd) { var getCancelResultsFunction = function(dfd) {
return function() { return function() {
dfd.resolve([]); dfd.resolve([]);
} }
} };
if(samplesToShow.length > 50) { if(samplesToShow.length > 50) {
var toExecute = function() { var toExecute = function() {
Util.blockUIConfirm("Do you want to show " + samplesWithoutELNParents.length + " " + ELNDictionary.Samples + " on the tree?", Util.blockUIConfirm("Do you want to show " + samplesWithoutELNParents.length + " " + ELNDictionary.Samples + " on the tree?",
getOkResultsFunction(dfd, samplesToShow), getOkResultsFunction(dfd, samplesToShow),
getCancelResultsFunction(dfd)); getCancelResultsFunction(dfd));
} };
setTimeout(toExecute, 1000); setTimeout(toExecute, 1000);
} else { } else {
getOkResultsFunction(dfd, samplesToShow)(); getOkResultsFunction(dfd, samplesToShow)();
} }
}); });
break; break;
...@@ -841,7 +841,7 @@ function SideMenuWidgetView(sideMenuWidgetController, sideMenuWidgetModel) { ...@@ -841,7 +841,7 @@ function SideMenuWidgetView(sideMenuWidgetController, sideMenuWidgetModel) {
setCustomIcon($tree, "JUPYTER_WORKSPACE", "./img/jupyter-icon.png"); setCustomIcon($tree, "JUPYTER_WORKSPACE", "./img/jupyter-icon.png");
setCustomIcon($tree, "NEW_JUPYTER_NOTEBOOK", "./img/jupyter-icon.png"); setCustomIcon($tree, "NEW_JUPYTER_NOTEBOOK", "./img/jupyter-icon.png");
} };
function setCustomIcon($tree, nodeKey, iconImage) { function setCustomIcon($tree, nodeKey, iconImage) {
var node = $tree.fancytree("getTree").getNodeByKey(nodeKey); var node = $tree.fancytree("getTree").getNodeByKey(nodeKey);
......
openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/ZenodoExport/ZenodoExportView.js
+ 4
− 0
View file @ fa1eca60
...@@ -45,5 +45,9 @@ function ZenodoExportView(exportController, exportModel) { ...@@ -45,5 +45,9 @@ function ZenodoExportView(exportController, exportModel) {
var $formTitle = $('<h2>').append('Zenodo Export Builder'); var $formTitle = $('<h2>').append('Zenodo Export Builder');
$header.append($formTitle); $header.append($formTitle);
var $exportButton = $('<input>', { 'type': 'submit', 'class': 'btn btn-primary', 'value': 'Export Selected',
'onClick': '$("form[name=\'rcExportForm\']").submit()'});
$header.append($exportButton);
}; };
} }
\ No newline at end of file
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment