X-Git-Url: https://code.grnet.gr/git/pithos-web-client/blobdiff_plain/abd8738fdfd3d48c9d543ca38aca99a2b6b709da..1201686bb4bd5ac0ff4b7bd38064ac0976ed3c9c:/src/gr/grnet/pithos/web/client/FilePropertiesDialog.java diff --git a/src/gr/grnet/pithos/web/client/FilePropertiesDialog.java b/src/gr/grnet/pithos/web/client/FilePropertiesDialog.java index 41bdd3f..989d8c9 100644 --- a/src/gr/grnet/pithos/web/client/FilePropertiesDialog.java +++ b/src/gr/grnet/pithos/web/client/FilePropertiesDialog.java @@ -51,6 +51,7 @@ import com.google.gwt.core.client.GWT; import com.google.gwt.core.client.Scheduler; import com.google.gwt.event.dom.client.ClickEvent; import com.google.gwt.event.dom.client.ClickHandler; +import com.google.gwt.http.client.Response; import com.google.gwt.i18n.client.DateTimeFormat; import com.google.gwt.resources.client.ImageResource; import com.google.gwt.user.client.Window; @@ -86,7 +87,7 @@ public class FilePropertiesDialog extends AbstractPropertiesDialog { @Source("gr/grnet/pithos/resources/edit_user.png") ImageResource permUser(); - @Source("gr/grnet/pithos/resources/groupevent.png") + @Source("gr/grnet/pithos/resources/groups22.png") ImageResource permGroup(); @Source("gr/grnet/pithos/resources/editdelete.png") @@ -187,6 +188,11 @@ public class FilePropertiesDialog extends AbstractPropertiesDialog { else app.displayError("System error unable to fetch versions: "+t.getMessage()); } + + @Override + protected void onUnauthorized(Response response) { + app.sessionExpired(); + } }; getVersions.setHeader("X-Auth-Token", app.getToken()); Scheduler.get().scheduleDeferred(getVersions); @@ -388,7 +394,7 @@ public class FilePropertiesDialog extends AbstractPropertiesDialog { String[] tagset = null; if (!tags.getText().equals(initialTagText)) - tagset = tags.getText().split(","); + tagset = tags.getText().trim().split(","); final String[] newTags = tagset; if (newFilename != null) { @@ -404,6 +410,11 @@ public class FilePropertiesDialog extends AbstractPropertiesDialog { GWT.log("", t); app.displayError("System error modifying file:" + t.getMessage()); } + + @Override + protected void onUnauthorized(Response response) { + app.sessionExpired(); + } }; updateFile.setHeader("X-Auth-Token", app.getToken()); updateFile.setHeader("X-Move-From", file.getUri()); @@ -427,11 +438,19 @@ public class FilePropertiesDialog extends AbstractPropertiesDialog { GWT.log("", t); app.displayError("System error modifying file:" + t.getMessage()); } + + @Override + protected void onUnauthorized(Response response) { + app.sessionExpired(); + } }; updateFile.setHeader("X-Auth-Token", app.getToken()); if (newTags != null) for (String t : newTags) - updateFile.setHeader("X-Object-Meta-" + t.trim(), "true"); + if (t.length() > 0) + updateFile.setHeader("X-Object-Meta-" + t.trim(), "true"); + for (String t : file.getTags()) + updateFile.setHeader("X-Object-Meta-" + t.trim(), "~"); if (published != null) updateFile.setHeader("X-Object-Public", published.toString()); if (newPermissions != null) {