projects
/
pithos-web-client
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added an option for user credentials on user menu
[pithos-web-client]
/
src
/
gr
/
grnet
/
pithos
/
web
/
client
/
FileUploadDialog.java
diff --git
a/src/gr/grnet/pithos/web/client/FileUploadDialog.java
b/src/gr/grnet/pithos/web/client/FileUploadDialog.java
index
979d57b
..
3bf47cd
100644
(file)
--- a/
src/gr/grnet/pithos/web/client/FileUploadDialog.java
+++ b/
src/gr/grnet/pithos/web/client/FileUploadDialog.java
@@
-42,7
+42,10
@@
import com.google.gwt.dom.client.NativeEvent;
import com.google.gwt.event.dom.client.ClickEvent;
import com.google.gwt.event.dom.client.ClickHandler;
import com.google.gwt.event.dom.client.KeyCodes;
import com.google.gwt.event.dom.client.ClickEvent;
import com.google.gwt.event.dom.client.ClickHandler;
import com.google.gwt.event.dom.client.KeyCodes;
+import com.google.gwt.user.client.Command;
+import com.google.gwt.user.client.Cookies;
import com.google.gwt.user.client.Event.NativePreviewEvent;
import com.google.gwt.user.client.Event.NativePreviewEvent;
+import com.google.gwt.user.client.Window;
import com.google.gwt.user.client.ui.Button;
import com.google.gwt.user.client.ui.DialogBox;
import com.google.gwt.user.client.ui.FileUpload;
import com.google.gwt.user.client.ui.Button;
import com.google.gwt.user.client.ui.DialogBox;
import com.google.gwt.user.client.ui.FileUpload;
@@
-153,6
+156,7
@@
public class FileUploadDialog extends DialogBox {
@Override
public void onSubmit(@SuppressWarnings("unused") SubmitEvent event) {
auth.setValue(app.getToken()); //This is done here because the app object is not available in the constructor
@Override
public void onSubmit(@SuppressWarnings("unused") SubmitEvent event) {
auth.setValue(app.getToken()); //This is done here because the app object is not available in the constructor
+ Cookies.setCookie("X-Auth-Token", app.getToken(), null, Window.Location.getHostName(), app.getApiPath(), false);
}
});
form.addSubmitCompleteHandler(new SubmitCompleteHandler() {
}
});
form.addSubmitCompleteHandler(new SubmitCompleteHandler() {
@@
-171,7
+175,16
@@
public class FileUploadDialog extends DialogBox {
GWT.log(results, null);
app.displayError(results);
}
GWT.log(results, null);
app.displayError(results);
}
- app.updateFolder(folder, true);
+ if (app.getSelectedTree().equals(app.getFolderTreeView()))
+ app.updateFolder(folder, true, new Command() {
+
+ @Override
+ public void execute() {
+ app.updateStatistics();
+ }
+ });
+ else
+ app.updateOtherSharedFolder(folder, true);
hide();
}
});
hide();
}
});
@@
-206,7
+219,7
@@
public class FileUploadDialog extends DialogBox {
return;
}
final String fname = getFilename(upload.getFilename());
return;
}
final String fname = getFilename(upload.getFilename());
- String apath = app.getApiPath() + app.getUsername() + folder.getUri() + "/" + fname;
+ String apath = app.getApiPath() + folder.getOwner() + folder.getUri() + "/" + fname;
form.setAction(apath);
submit.setEnabled(false);
upload.setVisible(false);
form.setAction(apath);
submit.setEnabled(false);
upload.setVisible(false);