suzanne.soy/zotero
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't switch libraries when uneditable in /getSelectedCollection

Browse Source 
Follow-up to d0e42a1186
This commit is contained in:
Dan Stillman 2018-04-27 18:58:12 -04:00
parent d0e42a1186
commit a0d85c0673
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
chrome/content/zotero/xpcom/connector/server_connector.js
View File

@ -27,17 +27,17 @@ const CONNECTOR_API_VERSION = 2;
Zotero.Server.Connector = { Zotero.Server.Connector = {
_waitingForSelection: {}, _waitingForSelection: {},
getSaveTarget: function () { getSaveTarget: function (allowReadOnly) {
var zp = Zotero.getActiveZoteroPane(); var zp = Zotero.getActiveZoteroPane();
var library = null; var library = null;
var collection = null; var collection = null;
var editable = null; var editable = null;
if (zp && zp.collectionsView) { if (zp && zp.collectionsView) {
if (zp.collectionsView.editable) { if (zp.collectionsView.editable || allowReadOnly) {
library = Zotero.Libraries.get(zp.getSelectedLibraryID()); library = Zotero.Libraries.get(zp.getSelectedLibraryID());
collection = zp.getSelectedCollection(); collection = zp.getSelectedCollection();
editable = true; editable = zp.collectionsView.editable;
} }
// If not editable, switch to My Library if it exists and is editable // If not editable, switch to My Library if it exists and is editable
else { else {
@ -59,7 +59,7 @@ Zotero.Server.Connector = {
let id = Zotero.Prefs.get('lastViewedFolder'); let id = Zotero.Prefs.get('lastViewedFolder');
if (id) { if (id) {
({ library, collection, editable } = this.resolveTarget(id)); ({ library, collection, editable } = this.resolveTarget(id));
if (!editable) { if (!editable && !allowReadOnly) {
let userLibrary = Zotero.Libraries.userLibrary; let userLibrary = Zotero.Libraries.userLibrary;
if (userLibrary && userLibrary.editable) { if (userLibrary && userLibrary.editable) {
Zotero.debug("Save target isn't editable -- switching to My Library"); Zotero.debug("Save target isn't editable -- switching to My Library");
@ -1091,7 +1091,7 @@ Zotero.Server.Connector.GetSelectedCollection.prototype = {
* @param {Function} sendResponseCallback function to send HTTP response * @param {Function} sendResponseCallback function to send HTTP response
*/ */
init: function(postData, sendResponseCallback) { init: function(postData, sendResponseCallback) {
var { library, collection, editable } = Zotero.Server.Connector.getSaveTarget(); var { library, collection, editable } = Zotero.Server.Connector.getSaveTarget(true);
var response = { var response = {
libraryID: library.libraryID, libraryID: library.libraryID,
libraryName: library.name, libraryName: library.name,