ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2025-04-10 20:30:00 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

wui: fix bug in which empty directory is marked as "unreadable", add test, remove exclamation point

Browse Source
This commit is contained in:
Zooko O'Whielacronx 2009-04-07 11:28:34 -07:00
parent b867cb3ce0
commit 8b1cd154da
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/allmydata/test/test_web.py
View File

@ -917,7 +917,9 @@ class Web(WebMixin, WebErrorMixin, testutil.StallMixin, unittest.TestCase):
# and an empty directory
d.addCallback(lambda res: self.GET(self.public_url + "/foo/empty/"))
def _check4(res):
self.failUnless("directory is empty!" in res, res)
self.failUnless("directory is empty" in res, res)
MKDIR_BUTTON_RE=re.compile('<input type="hidden" name="t" value="mkdir" />.*<legend class="freeform-form-label">Create a new directory</legend>.*<input type="submit" value="Create" />', re.I)
self.failUnless(MKDIR_BUTTON_RE.search(res), res)
d.addCallback(_check4)
return d

2
src/allmydata/web/directory.py
View File

@ -658,7 +658,7 @@ class DirectoryAsHTML(rend.Page):
if self.node.is_readonly():
return T.div["No upload forms: directory is read-only"]
if not self.dirnode_children:
if self.dirnode_children is None:
return T.div["No upload forms: directory is unreadable"]
mkdir = T.form(action=".", method="post",

2
src/allmydata/web/directory.xhtml
View File

@ -38,7 +38,7 @@
<td><n:slot name="info"/></td>
</tr>
<tr n:pattern="empty"><td>directory is empty!</td></tr>
<tr n:pattern="empty"><td>directory is empty</td></tr>
</table>
</div>