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

Merge branch '3.0' of github.com:zotero/zotero into 3.0

Browse source
This commit is contained in:
Simon Kornblith 2012-02-05 18:01:24 -05:00
commit ff692392c9
3 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
chrome/content/zotero/overlay.xul
View file

@ -77,7 +77,7 @@
<image src="chrome://zotero/skin/treeitem-book.png" id="zotero-status-image" <image src="chrome://zotero/skin/treeitem-book.png" id="zotero-status-image"
onclick="if(event.button === 0) Zotero_Browser.scrapeThisPage()" context="zotero-status-image-context" onclick="if(event.button === 0) Zotero_Browser.scrapeThisPage()" context="zotero-status-image-context"
position="1" hidden="true"/> position="1" hidden="true"/>
<zoteroguidancepanel id="zotero-status-image-guidance" about="saveIcon" for="zotero-status-image"/> <zoteroguidancepanel id="zotero-status-image-guidance" about="saveIcon" for="zotero-status-image" x="8"/>
</hbox> </hbox>
<menupopup id="menu_ToolsPopup"> <menupopup id="menu_ToolsPopup">

10
chrome/content/zotero/xpcom/data/tag.js
View file

@ -353,7 +353,15 @@ Zotero.Tag.prototype.save = function (full) {
var sql = "UPDATE tags SET " + columns.join("=?, ") + "=?" var sql = "UPDATE tags SET " + columns.join("=?, ") + "=?"
+ " WHERE tagID=?"; + " WHERE tagID=?";
Zotero.DB.query(sql, sqlValues); try {
Zotero.DB.query(sql, sqlValues);
}
// TEMP
catch (e) {
var sql = "SELECT * FROM tags";
Zotero.debug(Zotero.DB.query(sql));
throw (e);
}
} }

4
chrome/content/zotero/zoteroPane.js
View file

@ -3169,10 +3169,10 @@ var ZoteroPane = new function()
if (item.libraryID) { if (item.libraryID) {
var group = Zotero.Groups.getByLibraryID(item.libraryID); var group = Zotero.Groups.getByLibraryID(item.libraryID);
filesEditable = group.filesEditable; var filesEditable = group.filesEditable;
} }
else { else {
filesEditable = true; var filesEditable = true;
} }
if (saveSnapshot) { if (saveSnapshot) {