diff options
author | Nico von Geyso <Nico.Geyso@FU-Berlin.de> | 2012-05-21 14:52:46 +0200 |
---|---|---|
committer | Nico von Geyso <Nico.Geyso@FU-Berlin.de> | 2012-05-21 14:52:46 +0200 |
commit | 5bd5effacb799e1ba133d9bce7a56345ccd34d65 (patch) | |
tree | 413e375951efaf73f82832fec6d734f24ea7caa5 | |
parent | 994d7b9b6c7ad8b3366f7152fffb5f5daca4a2e5 (diff) | |
download | klausuren-5bd5effacb799e1ba133d9bce7a56345ccd34d65.tar.gz klausuren-5bd5effacb799e1ba133d9bce7a56345ccd34d65.tar.bz2 klausuren-5bd5effacb799e1ba133d9bce7a56345ccd34d65.zip |
file gets replaced by link after upload is finished
-rw-r--r-- | app.py | 5 | ||||
-rw-r--r-- | fit.py | 2 | ||||
-rw-r--r-- | static/upload.js | 5 |
3 files changed, 8 insertions, 4 deletions
@@ -1,7 +1,8 @@ import magic from fit import Fit -from flask import Flask, render_template, request, flash, redirect, url_for +from flask import Flask, render_template, request, flash, redirect, \ + url_for,jsonify from werkzeug import secure_filename @@ -82,6 +83,8 @@ def index(): flash("File %s saved." % filename) + return jsonify(jsonrpc='2.0',url=url_for('show', oid=oid)) + return render_template( 'index.html', tags=fit.get_all_tags() @@ -100,7 +100,7 @@ class Fit: parents ) - return b2a_hex(commit).decode('ascii') + return b2a_hex(blob_oid).decode('ascii') def get_all_files(self): diff --git a/static/upload.js b/static/upload.js index 48f5581..7ab20e0 100644 --- a/static/upload.js +++ b/static/upload.js @@ -69,7 +69,8 @@ fileUploader.init = function() { up.refresh(); // Reposition Flash/Silverlight }); - uploader.bind('FileUploaded', function(up, file) { - console.log(file); + uploader.bind('FileUploaded', function(up, file, response) { + var responseObj = jQuery.parseJSON(response.response) + $('#'+file.id).html('<a href="'+responseObj.url+'">'+file.name+'</a>'); }); }; |