From: Leif Ryge Date: Sun, 19 May 2013 07:31:43 +0000 (+0000) Subject: properly describe saving incident reports. closes #1974 X-Git-Tag: allmydata-tahoe-1.10.1a1~240 X-Git-Url: https://git.rkrishnan.org/pf/content/simplejson/install.html?a=commitdiff_plain;h=30924a506ced5c1f06e034b4f1482217746255ca;p=tahoe-lafs%2Ftahoe-lafs.git properly describe saving incident reports. closes #1974 --- diff --git a/src/allmydata/test/test_web.py b/src/allmydata/test/test_web.py index 3b12549c..9db671c6 100644 --- a/src/allmydata/test/test_web.py +++ b/src/allmydata/test/test_web.py @@ -4377,7 +4377,7 @@ class Web(WebMixin, WebErrorMixin, testutil.StallMixin, testutil.ReallyEqualMixi d = self.POST("/report_incident", details="eek") def _done(res): self.failIfIn("", res) - self.failUnlessIn("Thank you for your report!", res) + self.failUnlessIn("An incident report has been saved", res) d.addCallback(_done) return d diff --git a/src/allmydata/web/root.py b/src/allmydata/web/root.py index b4b7a85c..03ff87f0 100644 --- a/src/allmydata/web/root.py +++ b/src/allmydata/web/root.py @@ -123,7 +123,7 @@ class IncidentReporter(RenderMixin, rend.Page): details=get_arg(req, "details", ""), level=log.WEIRD, umid="LkD9Pw") 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 @@ -383,6 +383,6 @@ class Root(rend.Page): T.input(type="hidden", name="t", value="report-incident"), "What went wrong?"+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] diff --git a/src/allmydata/web/welcome.xhtml b/src/allmydata/web/welcome.xhtml index 9e1228e7..0b796b22 100644 --- a/src/allmydata/web/welcome.xhtml +++ b/src/allmydata/web/welcome.xhtml @@ -121,7 +121,7 @@