mirrors/zotero
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Fix title display when installing style via connector (broken in 0f1687f1c7)

Browse source
This commit is contained in:
Dan Stillman 2018-08-13 18:16:43 -04:00
parent 51996b537d
commit 11f8bd20d6
2 changed files with 10 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
chrome/content/zotero/xpcom/connector/server_connector.js
View file

@ -1030,13 +1030,13 @@ Zotero.Server.Connector.InstallStyle.prototype = {
init: Zotero.Promise.coroutine(function* (requestData) { init: Zotero.Promise.coroutine(function* (requestData) {
try { try {
var { styleName, styleID } = yield Zotero.Styles.install( var { styleTitle, styleID } = yield Zotero.Styles.install(
requestData.data, requestData.query.origin || null, true requestData.data, requestData.query.origin || null, true
); );
} catch (e) { } catch (e) {
return [400, "text/plain", e.message]; return [400, "text/plain", e.message];
} }
return [201, "application/json", JSON.stringify({name: styleName})]; return [201, "application/json", JSON.stringify({name: styleTitle})];
}) })
}; };

12
test/tests/server_connectorTest.js
View file

@ -674,10 +674,14 @@ describe("Connector Server", function () {
.createInstance(Components.interfaces.nsIDOMParser), .createInstance(Components.interfaces.nsIDOMParser),
doc = parser.parseFromString(style, "application/xml"); doc = parser.parseFromString(style, "application/xml");
return Zotero.Promise.resolve( return Zotero.Promise.resolve({
Zotero.Utilities.xpathText(doc, '/csl:style/csl:info[1]/csl:title[1]', styleTitle: Zotero.Utilities.xpathText(
Zotero.Styles.ns) doc, '/csl:style/csl:info[1]/csl:title[1]', Zotero.Styles.ns
); ),
styleID: Zotero.Utilities.xpathText(
doc, '/csl:style/csl:info[1]/csl:id[1]', Zotero.Styles.ns
)
});
}); });
var style = `<?xml version="1.0" encoding="utf-8"?> var style = `<?xml version="1.0" encoding="utf-8"?>