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

- Add separate message for group quota errors

Browse source 
- Allow errors to suppress "Report Error..." button
This commit is contained in:
Dan Stillman 2009-11-20 08:22:08 +00:00
parent 0bd4f19df1
commit 1746450abf
2 changed files with 60 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
chrome/content/zotero/xpcom/storage/zfs.js
View file

@ -419,8 +419,47 @@ Zotero.Sync.Storage.Session.ZFS.prototype._getFileUploadParameters = function (i
self.onError(e);
}
else {
// TODO: localize
var text, buttonText = null, buttonCallback;
// Group file
if (item.libraryID) {
var group = Zotero.Groups.getByLibraryID(item.libraryID);
text = "The group '" + group.name + "' has reached its "
+ "Zotero File Storage quota. Some files were not uploaded. "
+ "Other Zotero data will continue to sync to the server.\n\n"
+ "The group owner can increase the group's storage capacity "
+ "from the storage settings section on zotero.org.";
}
// Personal file
else {
text = "You have reached your Zotero File Storage quota. Some files were not uploaded. "
+ "Other Zotero data will continue to sync to the server.\n\n"
+ "See your zotero.org account settings for additional storage options.";
buttonText = "Open Account Settings";
buttonCallback = function () {
var url = "https://www.zotero.org/settings/storage";
var wm = Components.classes["@mozilla.org/appshell/window-mediator;1"]
.getService(Components.interfaces.nsIWindowMediator);
var win = wm.getMostRecentWindow("navigator:browser");
var browser = win.getBrowser();
browser.selectedTab = browser.addTab(url);
}
}
Zotero.debug(req.responseText);
var e = new Zotero.Error("File would exceed Zotero File Storage quota", "ZFS_OVER_QUOTA");
var e = new Zotero.Error(
"File would exceed Zotero File Storage quota",
"ZFS_OVER_QUOTA",
{
dialogText: text,
dialogButtonText: buttonText,
dialogButtonCallback: buttonCallback
}
);
self.onError(e);
}
return;

38
chrome/content/zotero/xpcom/sync.js
View file

@ -722,26 +722,22 @@ Zotero.Sync.Runner = new function () {
var buttonCallback;
if (e) {
if (e.error == Zotero.Error.ERROR_ZFS_OVER_QUOTA) {
// TODO: localize
message = "You have reached your Zotero File Storage quota. Some files were not synced. "
+ "Other Zotero data will continue to sync to the server.\n\n"
+ "See your zotero.org account settings for additional storage options.";
buttonText = "Open Account Settings";
buttonCallback = function () {
var url = "https://www.zotero.org/settings/storage";
var wm = Components.classes["@mozilla.org/appshell/window-mediator;1"]
.getService(Components.interfaces.nsIWindowMediator);
var win = wm.getMostRecentWindow("navigator:browser");
var browser = win.getBrowser();
browser.selectedTab = browser.addTab(url);
if (e.data) {
if (e.data.dialogText) {
message = e.data.dialogText;
}
if (typeof e.data.dialogButtonText != 'undefined') {
buttonText = e.data.dialogButtonText;
buttonCallback = e.data.dialogButtonCallback;
}
}
if (!message) {
message = e.message ? e.message : e;
if (e.message) {
message = e.message;
}
else {
message = e;
}
}
}
@ -764,7 +760,7 @@ Zotero.Sync.Runner = new function () {
// If secondary button not specified, just use an alert
if (!buttonText) {
prompt.alert(title, message);
pr.alert(title, message);
return;
}
@ -793,6 +789,12 @@ Zotero.Sync.Runner = new function () {
Components.utils.reportError(message);
}
// If secondary button is explicitly null, just use an alert
if (buttonText === null) {
pr.alert(title, message);
return;
}
var buttonFlags = pr.BUTTON_POS_0 * pr.BUTTON_TITLE_OK
+ pr.BUTTON_POS_1 * pr.BUTTON_TITLE_IS_STRING;
var index = pr.confirmEx(