diff --git a/static/js/importExportDialog.js b/static/js/importExportDialog.js index 1e1ce19..07d045a 100644 --- a/static/js/importExportDialog.js +++ b/static/js/importExportDialog.js @@ -3,7 +3,6 @@ oml.ui.importExportDialog = function(selected) { var ui = oml.user.ui, - username = oml.user.preferences.username, $bar = Ox.Bar({size: 24}), @@ -113,7 +112,7 @@ oml.ui.importExportDialog = function(selected) { function getListItems(selected) { var lists = ui._lists.filter(function(list) { - return list.user == username && list.type != 'library' && ( + return list.user == '' && list.type != 'library' && ( selected == 'export' || list.type == 'static' ); }); @@ -133,7 +132,7 @@ oml.ui.importExportDialog = function(selected) { function getListNames() { return ui._lists.filter(function(list) { - return list.user == username; + return list.user == ''; }).map(function(list) { return list.name; }); @@ -321,7 +320,10 @@ oml.ui.importExportDialog = function(selected) { }) ); $label['export'].show(); - (addList ? oml.addList : Ox.noop)(false, false, data.list, function() { + (addList ? oml.addList : Ox.noop)(false, false, data.list, function(result) { + if (result) { + data.list = result.data.id + } oml.api.import({ list: data.list, mode: data.mode, @@ -348,7 +350,7 @@ oml.ui.importExportDialog = function(selected) { var progress = data.status ? 1 : !data.progress[0] || !data.progress[1] ? -1 : data.progress[0] / data.progress[1]; - $progress[data.activity].options({progress: progress}) + $progress[data.activity] && $progress[data.activity].options({progress: progress}) } function setStatus(data) { diff --git a/static/js/utils.js b/static/js/utils.js index 352dd95..df2a1df 100644 --- a/static/js/utils.js +++ b/static/js/utils.js @@ -808,14 +808,13 @@ oml.getLists = function(callback) { }; oml.getOwnListNames = function() { - var ui = oml.user.ui, - username = oml.user.preferences.username; + var ui = oml.user.ui; return ui._lists.filter(function(list) { - return list.user == username; - }).filter(function(list) { + return list.user == '' && list.type != 'library'; + }).map(function(list) { return list.name; }); -} +}; oml.getPageTitle = function(stateOrURL) { var page = Ox.getObjectById(