ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2025-01-21 03:55:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

web: make 'delete' buttons work again

Browse Source
This commit is contained in:
Brian Warner 2007-07-07 20:46:30 -07:00
parent b3f0293d50
commit 0cb154f402
1 changed files with 24 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/allmydata/webish.py
View File

@ -86,9 +86,7 @@ class Directory(rend.Page):
# this creates a button which will cause our child__delete method # this creates a button which will cause our child__delete method
# to be invoked, which deletes the file and then redirects the # to be invoked, which deletes the file and then redirects the
# browser back to this directory # browser back to this directory
del_url = url.here.child("_delete") del_url = url.here.add("t", "delete").add("name", name)
#del_url = del_url.add("uri", target.uri)
del_url = del_url.add("name", name)
delete = T.form(action=del_url, method="post")[ delete = T.form(action=del_url, method="post")[
T.input(type='submit', value='del', name="del"), T.input(type='submit', value='del', name="del"),
] ]
@ -465,24 +463,41 @@ class POSTHandler(rend.Page):
def renderHTTP(self, ctx): def renderHTTP(self, ctx):
req = inevow.IRequest(ctx) req = inevow.IRequest(ctx)
t = req.fields["t"].value
if t == "mkdir": if "t" in req.args:
t = req.args["t"][0]
else:
t = req.fields["t"].value
name = None
if "name" in req.args:
name = req.args["name"][0]
elif name in req.fields:
name = req.fields["name"].value name = req.fields["name"].value
if t == "mkdir":
if not name:
raise RuntimeError("mkdir requires a name")
d = self._node.create_empty_directory(name) d = self._node.create_empty_directory(name)
def _done(res): def _done(res):
return "directory created" return "directory created"
d.addCallback(_done) d.addCallback(_done)
return d return d
elif t == "uri": elif t == "uri":
name = req.fields["name"].value if not name:
uri = req.fields["uri"].value raise RuntimeError("set-uri requires a name")
if "uri" in req.args:
uri = req.args["uri"][0]
else:
uri = req.fields["uri"].value
d = self._node.set_uri(name, uri) d = self._node.set_uri(name, uri)
def _done(res): def _done(res):
return uri return uri
d.addCallback(_done) d.addCallback(_done)
return d return d
elif t == "delete": elif t == "delete":
name = req.fields["name"].value if not name:
raise RuntimeError("delete requires a name")
d = self._node.delete(name) d = self._node.delete(name)
def _done(res): def _done(res):
return "thing deleted" return "thing deleted"
@ -490,9 +505,7 @@ class POSTHandler(rend.Page):
return d return d
elif t == "upload": elif t == "upload":
contents = req.fields["file"] contents = req.fields["file"]
name = contents.filename name = name or contents.filename
if "name" in req.fields:
name = req.fields["name"].value
uploadable = upload.FileHandle(contents.file) uploadable = upload.FileHandle(contents.file)
d = self._node.add_file(name, uploadable) d = self._node.add_file(name, uploadable)
def _done(newnode): def _done(newnode):