ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2024-12-20 13:33:09 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

properly describe saving incident reports. closes #1974

Browse Source
This commit is contained in:
Leif Ryge 2013-05-19 07:31:43 +00:00
parent 705c47f9e9
commit 30924a506c
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4377,7 +4377,7 @@ class Web(WebMixin, WebErrorMixin, testutil.StallMixin, testutil.ReallyEqualMixi
d = self.POST("/report_incident", details="eek") d = self.POST("/report_incident", details="eek")
def _done(res): def _done(res):
self.failIfIn("<html>", res) self.failIfIn("<html>", res)
self.failUnlessIn("Thank you for your report!", res) self.failUnlessIn("An incident report has been saved", res)
d.addCallback(_done) d.addCallback(_done)
return d return d

4
src/allmydata/web/root.py
View File

@ -123,7 +123,7 @@ class IncidentReporter(RenderMixin, rend.Page):
details=get_arg(req, "details", ""), details=get_arg(req, "details", ""),
level=log.WEIRD, umid="LkD9Pw") level=log.WEIRD, umid="LkD9Pw")
req.setHeader("content-type", "text/plain") req.setHeader("content-type", "text/plain")
return "Thank you for your report!" return "An incident report has been saved to logs/incidents/ in the node directory."
SPACE = u"\u00A0"*2 SPACE = u"\u00A0"*2
@ -383,6 +383,6 @@ class Root(rend.Page):
T.input(type="hidden", name="t", value="report-incident"), T.input(type="hidden", name="t", value="report-incident"),
"What went wrong?"+SPACE, "What went wrong?"+SPACE,
T.input(type="text", name="details"), SPACE, T.input(type="text", name="details"), SPACE,
T.input(type="submit", value=u"Report \u00BB"), T.input(type="submit", value=u"Save \u00BB"),
]] ]]
return T.div[form] return T.div[form]

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

@ -121,7 +121,7 @@
<hr/> <hr/>
<div class="nav-header"> <div class="nav-header">
<ul class="nav nav-list"> <ul class="nav nav-list">
<li class="nav-header">Report an Incident</li> <li class="nav-header">Save incident report</li>
<li><div n:render="incident_button" /></li> <li><div n:render="incident_button" /></li>
</ul> </ul>
</div> </div>